diff --git a/keystone/templates/cron-job-credential-rotate.yaml b/keystone/templates/cron-job-credential-rotate.yaml
index b40bac2d66..2dd00ba605 100644
--- a/keystone/templates/cron-job-credential-rotate.yaml
+++ b/keystone/templates/cron-job-credential-rotate.yaml
@@ -41,7 +41,7 @@ spec:
             {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
           containers:
             - name: keystone-credential-rotate
-              image: {{ .Values.images.tags.credential_rotate }}
+              image: {{ .Values.images.tags.keystone_credential_rotate }}
               imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               env:
diff --git a/keystone/templates/cron-job-fernet-rotate.yaml b/keystone/templates/cron-job-fernet-rotate.yaml
index 1f8efabe5f..faecb83ef6 100644
--- a/keystone/templates/cron-job-fernet-rotate.yaml
+++ b/keystone/templates/cron-job-fernet-rotate.yaml
@@ -41,7 +41,7 @@ spec:
             {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
           containers:
             - name: keystone-fernet-rotate
-              image: {{ .Values.images.tags.fernet_rotate }}
+              image: {{ .Values.images.tags.keystone_fernet_rotate }}
               imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_rotate | include "helm-toolkit.snippets.kubernetes_resources" | indent 14 }}
               env:
diff --git a/keystone/templates/deployment-api.yaml b/keystone/templates/deployment-api.yaml
index e771acf056..091eac74f2 100644
--- a/keystone/templates/deployment-api.yaml
+++ b/keystone/templates/deployment-api.yaml
@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_keystone_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: keystone-api
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.keystone_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/keystone/templates/job-credential-setup.yaml b/keystone/templates/job-credential-setup.yaml
index 9b30c93be2..de154ad813 100644
--- a/keystone/templates/job-credential-setup.yaml
+++ b/keystone/templates/job-credential-setup.yaml
@@ -36,7 +36,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: keystone-credential-setup
-          image: {{ .Values.images.tags.credential_setup }}
+          image: {{ .Values.images.tags.keystone_credential_setup }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.credential_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/keystone/templates/job-db-sync.yaml b/keystone/templates/job-db-sync.yaml
index 42874d8eb8..c881ebca05 100644
--- a/keystone/templates/job-db-sync.yaml
+++ b/keystone/templates/job-db-sync.yaml
@@ -37,7 +37,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_keystone_db_sync_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: keystone-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.keystone_db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/keystone/templates/job-fernet-setup.yaml b/keystone/templates/job-fernet-setup.yaml
index 5da31ec26f..0cbaeaa87a 100644
--- a/keystone/templates/job-fernet-setup.yaml
+++ b/keystone/templates/job-fernet-setup.yaml
@@ -37,7 +37,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
         - name: keystone-fernet-setup
-          image: {{ .Values.images.tags.fernet_setup }}
+          image: {{ .Values.images.tags.keystone_fernet_setup }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.fernet_setup | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/keystone/values.yaml b/keystone/values.yaml
index d520c3b933..f1c0ed095a 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -28,13 +28,13 @@ images:
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     test: docker.io/kolla/ubuntu-source-rally:4.0.0
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3
+    keystone_db_sync: docker.io/kolla/ubuntu-source-keystone:3.0.3
     db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3
-    fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
-    credential_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3
-    credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
-    api: docker.io/kolla/ubuntu-source-keystone:3.0.3
+    keystone_fernet_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3
+    keystone_fernet_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
+    keystone_credential_setup: docker.io/kolla/ubuntu-source-keystone:3.0.3
+    keystone_credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
+    keystone_api: docker.io/kolla/ubuntu-source-keystone:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: "IfNotPresent"