diff --git a/charts/drydock/templates/deployment.yaml b/charts/drydock/templates/deployment.yaml
index 888b9096..bd990c44 100644
--- a/charts/drydock/templates/deployment.yaml
+++ b/charts/drydock/templates/deployment.yaml
@@ -43,7 +43,7 @@ spec:
                 secretKeyRef:
                   name: 'maas-api-key'
                   key: 'token'
-          image: {{ .Values.images.drydock }}
+          image: {{ .Values.images.tags.drydock }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.api | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           ports:
diff --git a/charts/drydock/templates/job-drydock-db-init.yaml b/charts/drydock/templates/job-drydock-db-init.yaml
index cb7e3291..c6fdfb53 100644
--- a/charts/drydock/templates/job-drydock-db-init.yaml
+++ b/charts/drydock/templates/job-drydock-db-init.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: drydock-db-sync
-          image: {{ .Values.images.drydock_db_sync | quote }}
+          image: {{ .Values.images.tags.drydock_db_sync | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_sync | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/charts/drydock/templates/job-drydock-db-sync.yaml b/charts/drydock/templates/job-drydock-db-sync.yaml
index 746b5823..dc4dfd77 100644
--- a/charts/drydock/templates/job-drydock-db-sync.yaml
+++ b/charts/drydock/templates/job-drydock-db-sync.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: drydock-db-init
-          image: {{ .Values.images.drydock_db_init | quote }}
+          image: {{ .Values.images.tags.drydock_db_init | quote }}
           imagePullPolicy: {{ .Values.images.pull_policy | quote }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.drydock_db_init | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           env:
diff --git a/charts/drydock/templates/job-ks-endpoints.yaml b/charts/drydock/templates/job-ks-endpoints.yaml
index e01764d0..cbf2698e 100755
--- a/charts/drydock/templates/job-ks-endpoints.yaml
+++ b/charts/drydock/templates/job-ks-endpoints.yaml
@@ -37,7 +37,7 @@ spec:
 {{- range $key1, $osServiceType := tuple "physicalprovisioner" }}
 {{- range $key2, $osServiceEndPoint := tuple "admin" "internal" "public" }}
         - name: {{ $osServiceType }}-ks-endpoints-{{ $osServiceEndPoint }}
-          image: {{ $envAll.Values.images.ks_endpoints }}
+          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:
diff --git a/charts/drydock/templates/job-ks-service.yaml b/charts/drydock/templates/job-ks-service.yaml
index 1e919fb1..12399cc8 100755
--- a/charts/drydock/templates/job-ks-service.yaml
+++ b/charts/drydock/templates/job-ks-service.yaml
@@ -37,7 +37,7 @@ spec:
       containers:
 {{- range $key1, $osServiceType := tuple "physicalprovisioner" }}
         - name: {{ $osServiceType }}-ks-service-registration
-          image: {{ $envAll.Values.images.ks_service }}
+          image: {{ $envAll.Values.images.tags.ks_service }}
           imagePullPolicy: {{ $envAll.Values.images.pull_policy }}
           command:
             - /tmp/ks-service.sh
diff --git a/charts/drydock/templates/job-ks-user.yaml b/charts/drydock/templates/job-ks-user.yaml
index 8cb2ff17..e36ad32d 100755
--- a/charts/drydock/templates/job-ks-user.yaml
+++ b/charts/drydock/templates/job-ks-user.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: drydock-ks-user
-          image: {{ .Values.images.ks_user }}
+          image: {{ .Values.images.tags.ks_user }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ks_user | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/charts/drydock/values.yaml b/charts/drydock/values.yaml
index 00d21268..4a9ece25 100644
--- a/charts/drydock/values.yaml
+++ b/charts/drydock/values.yaml
@@ -22,13 +22,14 @@ labels:
   node_selector_value: enabled
 
 images:
-  drydock: quay.io/attcomdev/drydock:1.0.1
-  dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
-  ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
-  drydock_db_init: docker.io/postgres:9.5
-  drydock_db_sync: quay.io/attcomdev/drydock:1.0.1
+  tags:
+    drydock: quay.io/attcomdev/drydock:1.0.1
+    dep_check: docker.io/kolla/ubuntu-source-kubernetes-entrypoint:4.0.0
+    ks_user: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    ks_service: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    ks_endpoints: docker.io/kolla/ubuntu-source-kolla-toolbox:3.0.3
+    drydock_db_init: docker.io/postgres:9.5
+    drydock_db_sync: quay.io/attcomdev/drydock:1.0.1
   pull_policy: "IfNotPresent"
 
 network: