diff --git a/argocd-init/000-namespace.yml b/argocd-bootstrap/000-namespace.yml
similarity index 100%
rename from argocd-init/000-namespace.yml
rename to argocd-bootstrap/000-namespace.yml
diff --git a/argocd-init/001-argocd.yml b/argocd-bootstrap/001-argocd.yml
similarity index 92%
rename from argocd-init/001-argocd.yml
rename to argocd-bootstrap/001-argocd.yml
index 9897a0d..3d13f8c 100644
--- a/argocd-init/001-argocd.yml
+++ b/argocd-bootstrap/001-argocd.yml
@@ -11,8 +11,6 @@ spec:
   version: 7.5.2
   targetNamespace: argocd
   valuesContent: |-
-    server:
-      replicas: 1
     applicationSet:
       enabled: false
     notifications:
diff --git a/argocd-init/002-argocd-apps.yml b/argocd-bootstrap/002-argocd-apps.yml
similarity index 100%
rename from argocd-init/002-argocd-apps.yml
rename to argocd-bootstrap/002-argocd-apps.yml
diff --git a/docker-compose.yml b/docker-compose.yml
index 7b7b411..6d22520 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,7 +13,7 @@ services:
     volumes:
       - k3s-data:/var/lib/rancher/k3s/
       - k3s-run:/run/
-      - ./argocd-init/:/var/lib/rancher/k3s/server/manifests/argocd-init/
+      - ./argocd-bootstrap/:/var/lib/rancher/k3s/server/manifests/argocd-bootstrap/
 
 volumes:
   k3s-data:
diff --git a/_templates/argocd_app.libsonnet b/manifests/_templates/argocd_app.libsonnet
similarity index 100%
rename from _templates/argocd_app.libsonnet
rename to manifests/_templates/argocd_app.libsonnet
diff --git a/manifests/cert-manager/cert-manager.jsonnet b/manifests/cert-manager/cert-manager.jsonnet
index 6ea4824..83cf208 100644
--- a/manifests/cert-manager/cert-manager.jsonnet
+++ b/manifests/cert-manager/cert-manager.jsonnet
@@ -1,4 +1,4 @@
-local app = import "../_templates/argocd_app.libsonnet";
+local app = import "_templates/argocd_app.libsonnet";
 
 [
 app + {
diff --git a/manifests/ingress-nginx.jsonnet b/manifests/ingress-nginx.jsonnet
index 8c6b088..372ae54 100644
--- a/manifests/ingress-nginx.jsonnet
+++ b/manifests/ingress-nginx.jsonnet
@@ -1,4 +1,4 @@
-local app = import "../_templates/argocd_app.libsonnet";
+local app = import "_templates/argocd_app.libsonnet";
 
 [
 app + {
diff --git a/manifests/keel.jsonnet b/manifests/keel.jsonnet
index bbdbd8a..0b78f8a 100644
--- a/manifests/keel.jsonnet
+++ b/manifests/keel.jsonnet
@@ -1,4 +1,4 @@
-local app = import "../_templates/argocd_app.libsonnet";
+local app = import "_templates/argocd_app.libsonnet";
 
 [
 app + {
diff --git a/manifests/monitoring/zabbix-proxy.jsonnet b/manifests/monitoring/zabbix-proxy.jsonnet
index 124c7aa..790ba1f 100644
--- a/manifests/monitoring/zabbix-proxy.jsonnet
+++ b/manifests/monitoring/zabbix-proxy.jsonnet
@@ -1,4 +1,4 @@
-local app = import "../../_templates/argocd_app.libsonnet";
+local app = import "../_templates/argocd_app.libsonnet";
 
 [
 app + {
diff --git a/manifests/reloader.jsonnet b/manifests/reloader.jsonnet
index fdda29e..06471eb 100644
--- a/manifests/reloader.jsonnet
+++ b/manifests/reloader.jsonnet
@@ -1,4 +1,4 @@
-local app = import "../_templates/argocd_app.libsonnet";
+local app = import "_templates/argocd_app.libsonnet";
 
 [
 app + {