diff --git a/ceilometer/templates/job-db-init-mongodb.yaml b/ceilometer/templates/job-db-init-mongodb.yaml
index ebbe1a478e..0adb95e5fc 100644
--- a/ceilometer/templates/job-db-init-mongodb.yaml
+++ b/ceilometer/templates/job-db-init-mongodb.yaml
@@ -36,8 +36,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ceilometer-db-init-mongodb
-          image: {{ .Values.images.tags.db_init_mongodb | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_init_mongodb }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_mongodb | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/cinder/templates/job-db-drop.yaml b/cinder/templates/job-db-drop.yaml
index ea629dfd7d..45e650bcb5 100644
--- a/cinder/templates/job-db-drop.yaml
+++ b/cinder/templates/job-db-drop.yaml
@@ -44,8 +44,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: cinder-db-drop
-          image: {{ .Values.images.tags.db_drop | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_drop }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/gnocchi/templates/job-db-init-indexer.yaml b/gnocchi/templates/job-db-init-indexer.yaml
index daa03e01d0..76f2469d32 100644
--- a/gnocchi/templates/job-db-init-indexer.yaml
+++ b/gnocchi/templates/job-db-init-indexer.yaml
@@ -39,8 +39,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: gnocchi-db-init-indexer
-          image: {{ .Values.images.tags.db_init_indexer | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_init_indexer }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init_indexer | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/heat/templates/job-db-drop.yaml b/heat/templates/job-db-drop.yaml
index 6b22e1283b..4595c936ed 100644
--- a/heat/templates/job-db-drop.yaml
+++ b/heat/templates/job-db-drop.yaml
@@ -44,8 +44,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: heat-db-drop
-          image: {{ .Values.images.tags.db_drop | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_drop }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
index f17c06dd5d..0e55ebabfa 100644
--- a/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-db-init-mysql.yaml.tpl
@@ -59,8 +59,8 @@ spec:
 {{- range $key1, $dbToInit := $dbsToInit }}
 {{ $dbToInitType := default "oslo" $dbToInit.inputType }}
         - name: {{ printf "%s-%s-%d" $serviceNamePretty "db-init" $key1 | quote }}
-          image: {{ $envAll.Values.images.tags.db_init | quote }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy | quote }}
+          image: {{ $envAll.Values.images.tags.db_init }}
+          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl
index 480095f745..99830262ae 100644
--- a/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-endpoints.yaml.tpl
@@ -51,8 +51,8 @@ spec:
 {{- range $key1, $osServiceType := $serviceTypes }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ printf "%s-%s-%s" $osServiceType "ks-endpoints" $osServiceEndPoint | quote }}
-          image: {{ $envAll.Values.images.tags.ks_endpoints | quote }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy | quote }}
+          image: {{ $envAll.Values.images.tags.ks_endpoints }}
+          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_endpoints | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-endpoints.sh
diff --git a/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl
index 052bf825ca..63f3bd015e 100644
--- a/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-service.yaml.tpl
@@ -50,8 +50,8 @@ spec:
       containers:
 {{- range $key1, $osServiceType := $serviceTypes }}
         - name: {{ printf "%s-%s" $osServiceType "ks-service-registration" | quote }}
-          image: {{ $envAll.Values.images.tags.ks_service | quote }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy | quote }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
+          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_service | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-service.sh
diff --git a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
index f72d3753d1..49e11f220d 100644
--- a/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
+++ b/helm-toolkit/templates/manifests/_job-ks-user.yaml.tpl
@@ -49,8 +49,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: ks-user
-          image: {{ $envAll.Values.images.tags.ks_user | quote }}
-          imagePullPolicy: {{ $envAll.Values.images.pull_policy | quote }}
+          image: {{ $envAll.Values.images.tags.ks_user }}
+          imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
             - /tmp/ks-user.sh
diff --git a/magnum/templates/job-db-drop.yaml b/magnum/templates/job-db-drop.yaml
index f581099c7d..d4bf69c68e 100644
--- a/magnum/templates/job-db-drop.yaml
+++ b/magnum/templates/job-db-drop.yaml
@@ -44,8 +44,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: magnum-db-drop
-          image: {{ .Values.images.tags.db_drop | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_drop }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/mistral/templates/job-db-drop.yaml b/mistral/templates/job-db-drop.yaml
index 2286771082..c1dff16708 100644
--- a/mistral/templates/job-db-drop.yaml
+++ b/mistral/templates/job-db-drop.yaml
@@ -44,8 +44,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: mistral-db-drop
-          image: {{ .Values.images.tags.db_drop | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_drop }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION
diff --git a/senlin/templates/job-db-drop.yaml b/senlin/templates/job-db-drop.yaml
index e220b673c5..fd53baf551 100644
--- a/senlin/templates/job-db-drop.yaml
+++ b/senlin/templates/job-db-drop.yaml
@@ -44,8 +44,8 @@ spec:
 {{ tuple $envAll $dependencies list | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: senlin-db-drop
-          image: {{ .Values.images.tags.db_drop | quote }}
-          imagePullPolicy: {{ .Values.images.pull_policy | quote }}
+          image: {{ .Values.images.tags.db_drop }}
+          imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_drop | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
             - name: ROOT_DB_CONNECTION