diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml
index 6d59153ede..951c6d1718 100644
--- a/cinder/templates/job-db-init.yaml
+++ b/cinder/templates/job-db-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: cinder-db-init
           image: {{ .Values.images.db_init | quote }}
diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml
index 6be19e7084..b44d4799cf 100644
--- a/cinder/templates/job-db-sync.yaml
+++ b/cinder/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: cinder-db-sync
           image: {{ .Values.images.db_sync }}
diff --git a/cinder/templates/job-ks-endpoints.yaml.yaml b/cinder/templates/job-ks-endpoints.yaml.yaml
index 999aed4e8d..936a866b1b 100644
--- a/cinder/templates/job-ks-endpoints.yaml.yaml
+++ b/cinder/templates/job-ks-endpoints.yaml.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml
index d7035eb834..6a6f32a42a 100644
--- a/cinder/templates/job-ks-service.yaml
+++ b/cinder/templates/job-ks-service.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceType := tuple "volume" "volumev2" "volumev3" }}
         - name: {{ $osServiceType }}-ks-service-registration
diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml
index b8cdec3dd4..6690863997 100644
--- a/cinder/templates/job-ks-user.yaml
+++ b/cinder/templates/job-ks-user.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: cinder-ks-user
           image: {{ .Values.images.ks_user }}
diff --git a/glance/templates/db-sync.yaml b/glance/templates/db-sync.yaml
index 1b65da9e1e..fe0c1f56a3 100644
--- a/glance/templates/db-sync.yaml
+++ b/glance/templates/db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: glance-db-sync
           image: {{ .Values.images.db_sync }}
diff --git a/glance/templates/init.yaml b/glance/templates/init.yaml
index 5d8baa0c35..48b97a7cbd 100644
--- a/glance/templates/init.yaml
+++ b/glance/templates/init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: glance-init
           image: {{ .Values.images.init }}
diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml
index affd85693c..de256fbdf0 100644
--- a/heat/templates/job-db-init.yaml
+++ b/heat/templates/job-db-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: heat-db-init
           image: {{ .Values.images.db_init | quote }}
diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml
index 3c66c4c5af..8a7f90f3ed 100644
--- a/heat/templates/job-db-sync.yaml
+++ b/heat/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: heat-db-sync
           image: {{ .Values.images.db_sync }}
diff --git a/heat/templates/job-ks-endpoints.yaml.yaml b/heat/templates/job-ks-endpoints.yaml.yaml
index 4b3f30036a..d82c4fd525 100644
--- a/heat/templates/job-ks-endpoints.yaml.yaml
+++ b/heat/templates/job-ks-endpoints.yaml.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceName := tuple "heat" "heat-cfn" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml
index 3ce06a12a1..651422c355 100644
--- a/heat/templates/job-ks-service.yaml
+++ b/heat/templates/job-ks-service.yaml
@@ -31,6 +31,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
 {{- range $key1, $osServiceName := tuple "heat" "heat-cfn" }}
         - name: {{ $osServiceName }}-ks-service-registration
diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml
index 66981c9f0d..89c2d21f76 100644
--- a/heat/templates/job-ks-user.yaml
+++ b/heat/templates/job-ks-user.yaml
@@ -34,6 +34,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: heat-ks-user
           image: {{ .Values.images.ks_user }}
diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml
index a1fe50e1ec..c1f4954279 100644
--- a/keystone/templates/job-db-sync.yaml
+++ b/keystone/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: keystone-db-sync
           image: {{ .Values.images.db_sync }}
diff --git a/keystone/templates/job-init.yaml b/keystone/templates/job-init.yaml
index fa9f68081f..1f395255dc 100644
--- a/keystone/templates/job-init.yaml
+++ b/keystone/templates/job-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: keystone-init
           image: {{ .Values.images.init }}
diff --git a/mariadb/templates/job-seed.yaml b/mariadb/templates/job-seed.yaml
index 3b84b283aa..0495174af1 100644
--- a/mariadb/templates/job-seed.yaml
+++ b/mariadb/templates/job-seed.yaml
@@ -10,6 +10,8 @@ spec:
         app: mariadb
     spec:
       restartPolicy: Never
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: mariadb-init
           image: {{ .Values.images.mariadb }}
diff --git a/neutron/templates/job-db-sync.yaml b/neutron/templates/job-db-sync.yaml
index 1514fe87a0..ff546f790b 100644
--- a/neutron/templates/job-db-sync.yaml
+++ b/neutron/templates/job-db-sync.yaml
@@ -6,6 +6,8 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: neutron-db-sync
           image: {{ .Values.images.db_sync }}
diff --git a/neutron/templates/job-init.yaml b/neutron/templates/job-init.yaml
index c21cd69324..ef29d574a6 100644
--- a/neutron/templates/job-init.yaml
+++ b/neutron/templates/job-init.yaml
@@ -6,6 +6,8 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: neutron-init
           image: {{ .Values.images.init }}
diff --git a/neutron/templates/job-post.yaml b/neutron/templates/job-post.yaml
index 936d299fe3..847a19274e 100644
--- a/neutron/templates/job-post.yaml
+++ b/neutron/templates/job-post.yaml
@@ -6,6 +6,8 @@ spec:
   template:
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: neutron-post
           image: {{ .Values.images.post }}
diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml
index 013ad07569..da81fe0e13 100644
--- a/nova/templates/job-db-sync.yaml
+++ b/nova/templates/job-db-sync.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.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 70c873641e..2ca373358a 100644
--- a/nova/templates/job-init.yaml
+++ b/nova/templates/job-init.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.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 2c6fd237eb..e22373e02f 100644
--- a/nova/templates/job-post.yaml
+++ b/nova/templates/job-post.yaml
@@ -33,6 +33,8 @@ spec:
         ]'
     spec:
       restartPolicy: OnFailure
+      nodeSelector:
+        {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: nova-post
           image: {{ .Values.image.post }}