diff --git a/kubernetes/apps/production/drone/server/ingress.yaml b/kubernetes/apps/production/drone/ingress.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/server/ingress.yaml
rename to kubernetes/apps/production/drone/ingress.yaml
diff --git a/kubernetes/apps/production/drone/kustomization.yaml b/kubernetes/apps/production/drone/kustomization.yaml
index fdc3603..89dd3a4 100644
--- a/kubernetes/apps/production/drone/kustomization.yaml
+++ b/kubernetes/apps/production/drone/kustomization.yaml
@@ -4,10 +4,14 @@ kind: Kustomization
 namespace: drone-ci
 resources:
   - namespace.yaml
-  - ./server/sealed-secrets.yaml
-  - ./server/pvc.yaml
-  - ./server/server-deployment.yaml
-  - ./server/service.yaml
-  - ./server/ingress.yaml
-  - ./runner/runner-deployment.yaml
-  - ./runner/rbac.yaml
+  - sealed-secrets.yaml
+
+  # Server
+  - pvc.yaml
+  - server-deployment.yaml
+  - service.yaml
+  - ingress.yaml
+
+  # Runner
+  - runner-deployment.yaml
+  - rbac.yaml
diff --git a/kubernetes/apps/production/drone/server/pvc.yaml b/kubernetes/apps/production/drone/pvc.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/server/pvc.yaml
rename to kubernetes/apps/production/drone/pvc.yaml
diff --git a/kubernetes/apps/production/drone/runner/rbac.yaml b/kubernetes/apps/production/drone/rbac.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/runner/rbac.yaml
rename to kubernetes/apps/production/drone/rbac.yaml
diff --git a/kubernetes/apps/production/drone/runner/runner-deployment.yaml b/kubernetes/apps/production/drone/runner-deployment.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/runner/runner-deployment.yaml
rename to kubernetes/apps/production/drone/runner-deployment.yaml
diff --git a/kubernetes/apps/production/drone/server/sealed-secrets.yaml b/kubernetes/apps/production/drone/sealed-secrets.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/server/sealed-secrets.yaml
rename to kubernetes/apps/production/drone/sealed-secrets.yaml
diff --git a/kubernetes/apps/production/drone/server/server-deployment.yaml b/kubernetes/apps/production/drone/server-deployment.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/server/server-deployment.yaml
rename to kubernetes/apps/production/drone/server-deployment.yaml
diff --git a/kubernetes/apps/production/drone/server/service.yaml b/kubernetes/apps/production/drone/service.yaml
similarity index 100%
rename from kubernetes/apps/production/drone/server/service.yaml
rename to kubernetes/apps/production/drone/service.yaml