diff --git a/cinder/templates/deployment-api.yaml b/cinder/templates/deployment-api.yaml
index 64a522d070..58f14d61c5 100644
--- a/cinder/templates/deployment-api.yaml
+++ b/cinder/templates/deployment-api.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.api }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/cinder/templates/deployment-scheduler.yaml b/cinder/templates/deployment-scheduler.yaml
index 57a963a437..38f5e7c90d 100644
--- a/cinder/templates/deployment-scheduler.yaml
+++ b/cinder/templates/deployment-scheduler.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.scheduler }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.scheduler | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/cinder/templates/deployment-volume.yaml b/cinder/templates/deployment-volume.yaml
index 5debc13481..1c3d5c29d6 100644
--- a/cinder/templates/deployment-volume.yaml
+++ b/cinder/templates/deployment-volume.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.volume }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.volume | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/cinder/templates/job-db-init.yaml b/cinder/templates/job-db-init.yaml
index 96d36e70d5..d7f9f7dff2 100644
--- a/cinder/templates/job-db-init.yaml
+++ b/cinder/templates/job-db-init.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_init }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_init | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/cinder/templates/job-db-sync.yaml b/cinder/templates/job-db-sync.yaml
index 5b5c75beab..5639264b35 100644
--- a/cinder/templates/job-db-sync.yaml
+++ b/cinder/templates/job-db-sync.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_sync }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/cinder/templates/job-ks-endpoints.yaml.yaml b/cinder/templates/job-ks-endpoints.yaml.yaml
index 778359399c..0f80510006 100644
--- a/cinder/templates/job-ks-endpoints.yaml.yaml
+++ b/cinder/templates/job-ks-endpoints.yaml.yaml
@@ -8,8 +8,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.ks_endpoints }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.ks_endpoints | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/cinder/templates/job-ks-service.yaml b/cinder/templates/job-ks-service.yaml
index f6832e1870..ecc181bdd2 100644
--- a/cinder/templates/job-ks-service.yaml
+++ b/cinder/templates/job-ks-service.yaml
@@ -8,8 +8,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.ks_service }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.ks_service | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/cinder/templates/job-ks-user.yaml b/cinder/templates/job-ks-user.yaml
index fc7d50d5dc..b25cf2f3e8 100644
--- a/cinder/templates/job-ks-user.yaml
+++ b/cinder/templates/job-ks-user.yaml
@@ -8,8 +8,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.ks_user }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.ks_user | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/common/templates/_funcs.tpl b/common/templates/_funcs.tpl
index f6031fede9..abe6e1947b 100644
--- a/common/templates/_funcs.tpl
+++ b/common/templates/_funcs.tpl
@@ -22,17 +22,17 @@
 {{- include $wtf $context | sha256sum | quote -}}
 {{- end -}}
 
-{{- define "init-containers-header"}}
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-            "name": "init",
-            "image": {{ .Values.images.dep_check | default "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0" | quote }},
-            "imagePullPolicy": {{ .Values.images.pull_policy | default "IfNotPresent" | quote }},
-            "env": [
-              {
-                "name": "NAMESPACE",
-                "value": "{{ .Release.Namespace }}"
-              },
+{{- define "dep-check-init-cont-header"}}
+pod.beta.kubernetes.io/init-containers: '[
+  {
+    "name": "init",
+    "image": {{ .Values.images.dep_check | default "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0" | quote }},
+    "imagePullPolicy": {{ .Values.images.pull_policy | default "IfNotPresent" | quote }},
+    "env": [
+      {
+        "name": "NAMESPACE",
+        "value": "{{ .Release.Namespace }}"
+      },
 {{- end -}}
 
 {{- define "init-containers-footer" }}
diff --git a/glance/templates/api.yaml b/glance/templates/api.yaml
index 988e34ecaa..ac67d19fb0 100644
--- a/glance/templates/api.yaml
+++ b/glance/templates/api.yaml
@@ -17,8 +17,8 @@ spec:
       labels:
         app: glance-api
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.api }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/glance/templates/db-sync.yaml b/glance/templates/db-sync.yaml
index 209485beef..bae3d21222 100644
--- a/glance/templates/db-sync.yaml
+++ b/glance/templates/db-sync.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_sync }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/glance/templates/init.yaml b/glance/templates/init.yaml
index f92855b1b0..c3d8c825a4 100644
--- a/glance/templates/init.yaml
+++ b/glance/templates/init.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.init }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/glance/templates/post.yaml b/glance/templates/post.yaml
index a0fa89c612..e9f3174365 100644
--- a/glance/templates/post.yaml
+++ b/glance/templates/post.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.post }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.post | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/glance/templates/registry.yaml b/glance/templates/registry.yaml
index 51fb9ec62c..59936aca2b 100644
--- a/glance/templates/registry.yaml
+++ b/glance/templates/registry.yaml
@@ -9,8 +9,8 @@ spec:
       labels:
         app: glance-registry
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.registry }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.registry | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/heat/templates/deployment-api.yaml b/heat/templates/deployment-api.yaml
index d05e7fa3d5..36c7461907 100755
--- a/heat/templates/deployment-api.yaml
+++ b/heat/templates/deployment-api.yaml
@@ -9,8 +9,8 @@ spec:
       labels:
         app: heat-api
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.api }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/heat/templates/deployment-cfn.yaml b/heat/templates/deployment-cfn.yaml
index ca1d998e81..b0b1e53a48 100644
--- a/heat/templates/deployment-cfn.yaml
+++ b/heat/templates/deployment-cfn.yaml
@@ -9,8 +9,8 @@ spec:
       labels:
         app: heat-cfn
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.cnf }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.cnf | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/heat/templates/deployment-cloudwatch.yaml b/heat/templates/deployment-cloudwatch.yaml
index 3c350f402b..3ae57ecd14 100644
--- a/heat/templates/deployment-cloudwatch.yaml
+++ b/heat/templates/deployment-cloudwatch.yaml
@@ -9,8 +9,8 @@ spec:
       labels:
         app: heat-cloudwatch
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.cloudwatch }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.cloudwatch | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/heat/templates/job-db-init.yaml b/heat/templates/job-db-init.yaml
index bad7afa0b3..9e32324f3b 100644
--- a/heat/templates/job-db-init.yaml
+++ b/heat/templates/job-db-init.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_init }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_init | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/heat/templates/job-db-sync.yaml b/heat/templates/job-db-sync.yaml
index aa87773e04..50dbc303eb 100644
--- a/heat/templates/job-db-sync.yaml
+++ b/heat/templates/job-db-sync.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_sync }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/heat/templates/job-ks-endpoints.yaml.yaml b/heat/templates/job-ks-endpoints.yaml.yaml
index a3dbc3a40d..ffa08abd68 100644
--- a/heat/templates/job-ks-endpoints.yaml.yaml
+++ b/heat/templates/job-ks-endpoints.yaml.yaml
@@ -8,8 +8,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.ks_endpoints }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.ks_endpoints | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/heat/templates/job-ks-service.yaml b/heat/templates/job-ks-service.yaml
index 966671dcb4..fdb25e8690 100644
--- a/heat/templates/job-ks-service.yaml
+++ b/heat/templates/job-ks-service.yaml
@@ -8,8 +8,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.ks_service }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.ks_service | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/heat/templates/job-ks-user.yaml b/heat/templates/job-ks-user.yaml
index e6218b5623..8df1fe0309 100644
--- a/heat/templates/job-ks-user.yaml
+++ b/heat/templates/job-ks-user.yaml
@@ -11,8 +11,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.ks_user }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.ks_user | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/heat/templates/statefulset-engine.yaml b/heat/templates/statefulset-engine.yaml
index 483d8bdff7..5c63da0578 100644
--- a/heat/templates/statefulset-engine.yaml
+++ b/heat/templates/statefulset-engine.yaml
@@ -10,8 +10,8 @@ spec:
       labels:
         app: heat-engine
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.engine }}
+      {{  include "dep-check-init-cont-header" . }}
+      {{  include "dep-check-init-cont-footer" .Values.dependencies.engine }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/horizon/templates/deployment.yaml b/horizon/templates/deployment.yaml
index 2e332b672f..ebb98c454d 100644
--- a/horizon/templates/deployment.yaml
+++ b/horizon/templates/deployment.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.dashboard }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.dashboard | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml
index 5094759d43..514dace988 100644
--- a/keystone/templates/deployment.yaml
+++ b/keystone/templates/deployment.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.api }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml
index d85320a435..f914435b28 100644
--- a/keystone/templates/job-db-sync.yaml
+++ b/keystone/templates/job-db-sync.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_sync }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/keystone/templates/job-init.yaml b/keystone/templates/job-init.yaml
index f2e64c4804..b0de33d1e9 100644
--- a/keystone/templates/job-init.yaml
+++ b/keystone/templates/job-init.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.init }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/mariadb_restart.sh b/mariadb_restart.sh
new file mode 100644
index 0000000000..4e99ec0f0c
--- /dev/null
+++ b/mariadb_restart.sh
@@ -0,0 +1,9 @@
+helm delete mariadb --purge && rm mariadb-0.1.0.tgz && helm lint mariadb && helm package mariadb && helm install --replace --name mariadb mariadb-0.1.0.tgz
+helm delete keystone --purge && rm keystone-0.1.0.tgz && helm lint keystone && helm package keystone && helm install --replace --name keystone keystone-0.1.0.tgz --dry-run
+helm delete memcached --purge && rm memcached-0.1.0.tgz && helm lint memcached && helm package memcached && helm install --replace --name memcached memcached-0.1.0.tgz
+helm delete common --purge && rm common-0.1.0.tgz && helm lint common && helm package common && helm install --replace --name common common-0.1.0.tgz
+helm delete glance --purge && rm glance-0.1.0.tgz && helm lint glance && helm package glance && helm install --replace --name glance glance-0.1.0.tgz
+helm delete nova --purge && rm nova-0.1.0.tgz && helm lint nova && helm package nova && helm install --replace --name nova nova-0.1.0.tgz
+helm delete rabbitmq --purge && rm rabbitmq-0.1.0.tgz && helm lint rabbitmq && helm package rabbitmq && helm install --replace --name rabbitmq rabbitmq-0.1.0.tgz
+
+
diff --git a/nova/templates/daemonset-compute.yaml b/nova/templates/daemonset-compute.yaml
index d4fe85205e..cba819b4d3 100644
--- a/nova/templates/daemonset-compute.yaml
+++ b/nova/templates/daemonset-compute.yaml
@@ -10,8 +10,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.compute }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.compute | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }}
diff --git a/nova/templates/daemonset-libvirt.yaml b/nova/templates/daemonset-libvirt.yaml
index 13e673e4e2..4e3649fded 100644
--- a/nova/templates/daemonset-libvirt.yaml
+++ b/nova/templates/daemonset-libvirt.yaml
@@ -10,8 +10,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.libvirt }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.libvirt | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.compute_node_selector_key }}: {{ .Values.labels.compute_node_selector_value }}
diff --git a/nova/templates/deployment-api-metadata.yaml b/nova/templates/deployment-api-metadata.yaml
index fe3ce88d33..10016e7c6f 100644
--- a/nova/templates/deployment-api-metadata.yaml
+++ b/nova/templates/deployment-api-metadata.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.api }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
diff --git a/nova/templates/deployment-api-osapi.yaml b/nova/templates/deployment-api-osapi.yaml
index 49e998fd92..75c2985eac 100644
--- a/nova/templates/deployment-api-osapi.yaml
+++ b/nova/templates/deployment-api-osapi.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.api }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.api | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
diff --git a/nova/templates/deployment-conductor.yaml b/nova/templates/deployment-conductor.yaml
index 514e384a50..52eb790e6d 100644
--- a/nova/templates/deployment-conductor.yaml
+++ b/nova/templates/deployment-conductor.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.conductor }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.conductor | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
diff --git a/nova/templates/deployment-consoleauth.yaml b/nova/templates/deployment-consoleauth.yaml
index 1ee8f4e257..1c85319c5e 100644
--- a/nova/templates/deployment-consoleauth.yaml
+++ b/nova/templates/deployment-consoleauth.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.consoleauth }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.consoleauth | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
diff --git a/nova/templates/deployment-scheduler.yaml b/nova/templates/deployment-scheduler.yaml
index 4d97c2a53d..abc86d6826 100644
--- a/nova/templates/deployment-scheduler.yaml
+++ b/nova/templates/deployment-scheduler.yaml
@@ -19,8 +19,8 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "hash" }}        
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.scheduler }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.scheduler | indent 8 }}
     spec:
       nodeSelector:
         {{ .Values.labels.control_node_selector_key }}: {{ .Values.labels.control_node_selector_value }}
diff --git a/nova/templates/job-db-sync.yaml b/nova/templates/job-db-sync.yaml
index 881b1681dc..dc3be3427b 100644
--- a/nova/templates/job-db-sync.yaml
+++ b/nova/templates/job-db-sync.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.db_sync }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.db_sync | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/nova/templates/job-init.yaml b/nova/templates/job-init.yaml
index 39ee62cfc0..6bd3cfd7d7 100644
--- a/nova/templates/job-init.yaml
+++ b/nova/templates/job-init.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.init }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.init | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector:
diff --git a/nova/templates/job-post.yaml b/nova/templates/job-post.yaml
index ccf5059432..0aada421e7 100644
--- a/nova/templates/job-post.yaml
+++ b/nova/templates/job-post.yaml
@@ -6,8 +6,8 @@ spec:
   template:
     metadata:
       annotations:
-      {{  include "init-containers-header" . }}
-      {{  include "init-containers-footer" .Values.dependencies.post }}
+{{  include "dep-check-init-cont-header" . | indent 8 }}
+{{  include "dep-check-init-cont-footer" .Values.dependencies.post | indent 8 }}
     spec:
       restartPolicy: OnFailure
       nodeSelector: