diff --git a/clusters/default/apps/drone/Values.yaml b/clusters/default/apps/drone/Values.yaml
index 1eac277..5c53a80 100644
--- a/clusters/default/apps/drone/Values.yaml
+++ b/clusters/default/apps/drone/Values.yaml
@@ -1,21 +1,13 @@
 name: drone
 namespace: default
 
-image:
-  server:
-    repository: drone/drone
-    tag: 2
-  runner:
-    repository: drone/drone-runner-kube
-    tag: latest
-
 gitea:
   service:
     name: gitea-int-service
     port: 3000
 
-server:
-  env:
+env:
+  server:
     url: https://gitea.akshun-lab.uk
     host: drone.akshun-lab.uk
     proto: https
diff --git a/clusters/default/apps/drone/templates/drone-svc.yaml b/clusters/default/apps/drone/templates/drone-svc.yaml
index 0fc1f9d..fe24855 100644
--- a/clusters/default/apps/drone/templates/drone-svc.yaml
+++ b/clusters/default/apps/drone/templates/drone-svc.yaml
@@ -15,7 +15,7 @@ spec:
   ports:
   - {{- if eq .Values.service.type "LoadBalancer" }}
     port: {{ .Values.service.port }}
-    {{- if eq .Values.service.type "NodePort" }}
+    {{- else if eq .Values.service.type "NodePort" }}
     nodePort: {{ .Values.service.nodePort }}
     {{- end }}
     targetPort: 80
diff --git a/clusters/default/apps/drone/templates/drone.yaml b/clusters/default/apps/drone/templates/drone.yaml
index cdf8daf..fc17db8 100644
--- a/clusters/default/apps/drone/templates/drone.yaml
+++ b/clusters/default/apps/drone/templates/drone.yaml
@@ -29,11 +29,11 @@ spec:
             done
             echo "Gitea is ready!"
         - name: "{{ .Values.name }}-server"
-          image: "{{ .Values.image.server.repository }}:{{ .Values.image.server.tag }}"
+          image: drone/drone:2
           restartPolicy: Always
           env:
           - name: DRONE_GITEA_SERVER
-            value: "{{ .Values.server.env.url }}"
+            value: "{{ .Values.env.server.url }}"
           - name: DRONE_GITEA_CLIENT_ID
             valueFrom:
               secretKeyRef:
@@ -58,7 +58,7 @@ spec:
             mountPath: /data
       containers:
       - name: drone-runner
-        image: "{{ .Values.image.runner.repository }}:{{ .Values.image.runner.tag }}"
+        image: drone/drone-runner-kube:latest
         env:
         - name: DRONE_RPC_SERVER
           value: "http://localhost:80"