diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml
index ff546f79..e34f36dc 100644
--- a/neutron/templates/job-db-sync.yaml
+++ b/neutron/templates/job-db-sync.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
         - name: neutron-db-sync
           image: {{ .Values.images.db_sync }}
@@ -42,4 +42,4 @@ spec:
             name: neutron-etc
         - name: ml2confini
           configMap:
-            name: neutron-etc
\ No newline at end of file
+            name: neutron-etc
diff --git a/neutron/templates/job-init.yaml b/neutron/templates/job-init.yaml
index ef29d574..d7d34017 100644
--- a/neutron/templates/job-init.yaml
+++ b/neutron/templates/job-init.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
         - name: neutron-init
           image: {{ .Values.images.init }}
@@ -36,4 +36,4 @@ spec:
       volumes:
         - name: initsh
           configMap:
-            name: neutron-bin
\ No newline at end of file
+            name: neutron-bin
diff --git a/neutron/templates/job-post.yaml b/neutron/templates/job-post.yaml
index 847a1927..6c3a05d2 100644
--- a/neutron/templates/job-post.yaml
+++ b/neutron/templates/job-post.yaml
@@ -7,7 +7,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.server.node_selector_key }}: {{ .Values.labels.server.node_selector_value }}
       containers:
         - name: neutron-post
           image: {{ .Values.images.post }}
@@ -38,4 +38,4 @@ spec:
       volumes:
         - name: postsh
           configMap:
-            name: neutron-bin
\ No newline at end of file
+            name: neutron-bin
diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml
index da81fe0e..7a1404f4 100644
--- a/nova/templates/job-db-sync.yaml
+++ b/nova/templates/job-db-sync.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: nova-db-sync
           image: {{ .Values.image.db_sync }}
diff --git a/nova/templates/job-init.yaml b/nova/templates/job-init.yaml
index 2ca37335..7081a1e4 100644
--- a/nova/templates/job-init.yaml
+++ b/nova/templates/job-init.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: nova-init
           image: {{ .Values.image.init }}
diff --git a/nova/templates/job-post.yaml b/nova/templates/job-post.yaml
index e22373e0..e75cf0f5 100644
--- a/nova/templates/job-post.yaml
+++ b/nova/templates/job-post.yaml
@@ -34,7 +34,7 @@ spec:
     spec:
       restartPolicy: OnFailure
       nodeSelector:
-        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
+        {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
       containers:
         - name: nova-post
           image: {{ .Values.image.post }}