diff --git a/kustomize/bases/drone/drone-runner-deployment.yaml b/kustomize/bases/drone-runner/drone-runner-deployment.yaml
similarity index 100%
rename from kustomize/bases/drone/drone-runner-deployment.yaml
rename to kustomize/bases/drone-runner/drone-runner-deployment.yaml
diff --git a/kustomize/bases/drone-runner/kustomization.yaml b/kustomize/bases/drone-runner/kustomization.yaml
new file mode 100644
index 0000000..e47e165
--- /dev/null
+++ b/kustomize/bases/drone-runner/kustomization.yaml
@@ -0,0 +1,2 @@
+resources:
+  - drone-runner-deployment.yaml
diff --git a/kustomize/bases/drone/drone-server-deployment.yaml b/kustomize/bases/drone-server/drone-server-deployment.yaml
similarity index 100%
rename from kustomize/bases/drone/drone-server-deployment.yaml
rename to kustomize/bases/drone-server/drone-server-deployment.yaml
diff --git a/kustomize/bases/drone/drone-server-ingress.yaml b/kustomize/bases/drone-server/drone-server-ingress.yaml
similarity index 100%
rename from kustomize/bases/drone/drone-server-ingress.yaml
rename to kustomize/bases/drone-server/drone-server-ingress.yaml
diff --git a/kustomize/bases/drone/kustomization.yaml b/kustomize/bases/drone-server/kustomization.yaml
similarity index 82%
rename from kustomize/bases/drone/kustomization.yaml
rename to kustomize/bases/drone-server/kustomization.yaml
index 4d879ae..236d74b 100644
--- a/kustomize/bases/drone/kustomization.yaml
+++ b/kustomize/bases/drone-server/kustomization.yaml
@@ -1,5 +1,4 @@
 resources:
-  - drone-runner-deployment.yaml
   - drone-server-deployment.yaml
   - drone-server-ingress.yaml
 
diff --git a/kustomize/namespaces/gitea/kustomization.yaml b/kustomize/namespaces/gitea/kustomization.yaml
index a4813a9..1b386a6 100644
--- a/kustomize/namespaces/gitea/kustomization.yaml
+++ b/kustomize/namespaces/gitea/kustomization.yaml
@@ -1,6 +1,7 @@
 bases:
   - ../../bases/gitea
-  - ../../bases/drone
+  - ../../bases/drone-server
+  - ../../bases/drone-runner
 
 resources:
   - namespace.yaml