diff --git a/glance/templates/deployment-api.yaml b/glance/templates/deployment-api.yaml
index 49b94b0f23..66e72be4d0 100644
--- a/glance/templates/deployment-api.yaml
+++ b/glance/templates/deployment-api.yaml
@@ -43,7 +43,7 @@ spec:
       initContainers:
 {{ tuple $envAll $dependencies $mounts_glance_api_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         - name: glance-perms
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.glance_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: 0
@@ -58,7 +58,7 @@ spec:
               mountPath: {{ .Values.conf.glance.glance_store.filesystem_store_datadir }}
         {{ if eq .Values.storage "rbd" }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.glance_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}
@@ -81,7 +81,7 @@ spec:
         {{ end }}
       containers:
         - name: glance-api
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.glance_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/glance/templates/deployment-registry.yaml b/glance/templates/deployment-registry.yaml
index b28cbc3c4e..082d6754b5 100644
--- a/glance/templates/deployment-registry.yaml
+++ b/glance/templates/deployment-registry.yaml
@@ -44,7 +44,7 @@ spec:
 {{ tuple $envAll $dependencies $mounts_glance_registry_init | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-registry
-          image: {{ .Values.images.tags.registry }}
+          image: {{ .Values.images.tags.glance_registry }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.registry | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           securityContext:
diff --git a/glance/templates/job-clean.yaml b/glance/templates/job-clean.yaml
index d20c1d62e1..9fc6568a91 100644
--- a/glance/templates/job-clean.yaml
+++ b/glance/templates/job-clean.yaml
@@ -34,7 +34,7 @@ spec:
       containers:
         {{- if eq .Values.storage "rbd" }}
         - name: glance-secret-clean
-          image: {{ .Values.images.tags.storage_init }}
+          image: {{ .Values.images.tags.glance_storage_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.bootstrap | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/glance/templates/job-db-sync.yaml b/glance/templates/job-db-sync.yaml
index c7bf1605e4..922ba566bc 100644
--- a/glance/templates/job-db-sync.yaml
+++ b/glance/templates/job-db-sync.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: glance-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.glance_db_sync }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/glance/templates/job-storage-init.yaml b/glance/templates/job-storage-init.yaml
index 65d94802e5..b61fdbe605 100644
--- a/glance/templates/job-storage-init.yaml
+++ b/glance/templates/job-storage-init.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
         {{ if or (eq .Values.storage "rbd") (eq .Values.storage "radosgw") }}
         - name: ceph-keyring-placement
-          image: {{ .Values.images.tags.api }}
+          image: {{ .Values.images.tags.glance_api }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
           securityContext:
             runAsUser: {{ .Values.pod.user.glance.uid }}
@@ -55,7 +55,7 @@ spec:
         {{ end }}
       containers:
         - name: glance-storage-init
-          image: {{ .Values.images.tags.storage_init }}
+          image: {{ .Values.images.tags.glance_storage_init }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.storage_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/glance/values.yaml b/glance/values.yaml
index 376e88147e..2632ce48bd 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -29,15 +29,15 @@ release_group: null
 images:
   tags:
     test: docker.io/kolla/ubuntu-source-rally:4.0.0
-    storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
+    glance_storage_init: quay.io/attcomdev/ceph-daemon:tag-build-master-jewel-ubuntu-16.04
     db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    db_sync: docker.io/kolla/ubuntu-source-glance-api:3.0.3
+    glance_db_sync: docker.io/kolla/ubuntu-source-glance-api:3.0.3
     db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    api: docker.io/kolla/ubuntu-source-glance-api:3.0.3
-    registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3
+    glance_api: docker.io/kolla/ubuntu-source-glance-api:3.0.3
+    glance_registry: docker.io/kolla/ubuntu-source-glance-registry:3.0.3
     # Bootstrap image requires curl
     bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1