diff --git a/keystone/templates/deployment.yaml b/keystone/templates/deployment.yaml
index 7e52451b2c..371cb172ac 100644
--- a/keystone/templates/deployment.yaml
+++ b/keystone/templates/deployment.yaml
@@ -8,6 +8,27 @@ spec:
     metadata:
       labels:
         app: keystone-api
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+            "name": "init",
+            "image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
+            "env": [
+              {
+                "name": "DEPENDENCY_SERVICE",
+                "value": "mariadb"
+              },
+              {
+                "name": "DEPENDENCY_JOBS",
+                "value": "mariadb-seed,nova-db-sync"
+              },
+              {
+                "name": "COMMAND",
+                "value": "echo Done"
+              }
+            ]
+          }
+        ]'
     spec:
       nodeSelector:
         {{ .Values.global.deployment.control_node_label }}: enabled
diff --git a/mariadb/templates/mariadb-daemonset.yaml b/mariadb/templates/mariadb-daemonset.yaml
index 772246d945..3dffffaef7 100644
--- a/mariadb/templates/mariadb-daemonset.yaml
+++ b/mariadb/templates/mariadb-daemonset.yaml
@@ -11,6 +11,23 @@ spec:
       labels:
         app: mariadb
         galera: enabled
+      annotations:
+        pod.beta.kubernetes.io/init-containers: '[
+          {
+            "name": "init",
+            "image": "quay.io/stackanetes/kubernetes-entrypoint:v0.1.0",
+            "env": [
+              {
+                "name": "DEPENDENCY_JOBS",
+                "value": "mariadb-seed"
+              },
+              {
+                "name": "COMMAND",
+                "value": "echo Done"
+              }
+            ]
+          }
+        ]'
     spec:
       nodeSelector:
         {{ .Values.deployment.control_node_label }}: enabled