diff --git a/applications/20-databases/databases.yaml b/applications/20-databases/databases.yaml
index adcdc59..a8b8c29 100644
--- a/applications/20-databases/databases.yaml
+++ b/applications/20-databases/databases.yaml
@@ -10,23 +10,23 @@ spec:
         elements:
           - name: mariadb-operators
             path: applications/20-databases/mariadb-operators
-            namespace: database
+            nmsp: database
             wave: 1
           - name: postgresql
             path: applications/20-databases/postgresql
-            namespace: database
+            nmsp: database
             wave: 1
           - name: influxdb
             path: applications/20-databases/influxdb
-            namespace: database
+            nmsp: database
             wave: 1
           - name: redis
             path: applications/20-databases/redis
-            namespace: database
+            nmsp: database
             wave: 1
           - name: mariadb-database
             path: applications/20-databases/mariadb-database
-            namespace: database
+            nmsp: database
             wave: 2
   template:
     metadata:
@@ -39,7 +39,7 @@ spec:
         path: '{{path}}'
       destination:
         server: 'https://kubernetes.default.svc'
-        namespace: '{{namespace | default "database"}}'
+        namespace: '{{nmsp | default "database"}}'
       syncPolicy:
         automated:
           prune: true
diff --git a/deploy/server.yaml b/deploy/server.yaml
index 0253678..65d3922 100644
--- a/deploy/server.yaml
+++ b/deploy/server.yaml
@@ -10,32 +10,32 @@ spec:
         elements:
           - name: namespace
             path: applications/00-namespace
-            targetNamespace: home-server
+            nmsp: home-server
             wave: 1
 
           - name: replicator
             path: applications/10-replicator
-            targetNamespace: home-server
+            nmsp: home-server
             wave: 2
 
           - name: databases
             path: applications/20-databases
-            targetNamespace: database
+            nmsp: database
             wave: 2
 
           - name: domain-names
             path: applications/30-domain-names
-            targetNamespace: home-server
+            nmsp: home-server
             wave: 2
 
           - name: authentik
             path: applications/50-authentik
-            targetNamespace: home-server
+            nmsp: home-server
             wave: 3
 
           - name: nextcloud
             path: applications/50-nextcloud
-            targetNamespace: home-server
+            nmsp: home-server
             wave: 3
 
   template:
@@ -49,7 +49,7 @@ spec:
         path: '{{path}}'
       destination:
         server: 'https://kubernetes.default.svc'
-        namespace: '{{targetNamespace | default "default"}}'
+        namespace: '{{nmsp | default "default"}}'
       syncPolicy:
         automated:
           prune: true