diff --git a/congress/templates/deployment-api.yaml b/congress/templates/deployment-api.yaml
index b08ac37e3e..0a09c55cb3 100644
--- a/congress/templates/deployment-api.yaml
+++ b/congress/templates/deployment-api.yaml
@@ -38,7 +38,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
       - name: congress-api
-        image: {{ .Values.images.tags.api }}
+        image: {{ .Values.images.tags.congress_api }}
         imagePullPolicy: {{ .Values.images.pull_policy }}
         securityContext:
           runAsUser: {{ .Values.pod.user.congress.uid }}
diff --git a/congress/templates/deployment-datasource.yaml b/congress/templates/deployment-datasource.yaml
index c020eb77a5..6c3bf81562 100644
--- a/congress/templates/deployment-datasource.yaml
+++ b/congress/templates/deployment-datasource.yaml
@@ -38,7 +38,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
       - name: congress-datasource
-        image: {{ .Values.images.tags.datasource }}
+        image: {{ .Values.images.tags.congress_datasource }}
         imagePullPolicy: {{ .Values.images.pull_policy }}
         securityContext:
           runAsUser: {{ .Values.pod.user.congress.uid }}
diff --git a/congress/templates/deployment-policy-engine.yaml b/congress/templates/deployment-policy-engine.yaml
index df8e3d0d4c..91359d1da7 100644
--- a/congress/templates/deployment-policy-engine.yaml
+++ b/congress/templates/deployment-policy-engine.yaml
@@ -38,7 +38,7 @@ spec:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:
       - name: congress-policy-engine
-        image: {{ .Values.images.tags.policy_engine }}
+        image: {{ .Values.images.tags.congress_policy_engine }}
         imagePullPolicy: {{ .Values.images.pull_policy }}
         securityContext:
           runAsUser: {{ .Values.pod.user.congress.uid }}
diff --git a/congress/templates/job-db-sync.yaml b/congress/templates/job-db-sync.yaml
index f44c82ba2b..40e4da19f4 100644
--- a/congress/templates/job-db-sync.yaml
+++ b/congress/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: congress-db-sync
-          image: {{ .Values.images.tags.db_sync }}
+          image: {{ .Values.images.tags.congress_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/congress/templates/job-ds-create.yaml b/congress/templates/job-ds-create.yaml
index eb68ed1a48..988bb6c2fc 100644
--- a/congress/templates/job-ds-create.yaml
+++ b/congress/templates/job-ds-create.yaml
@@ -35,7 +35,7 @@ spec:
 {{ tuple $envAll $dependencies "[]" | include "helm-toolkit.snippets.kubernetes_entrypoint_init_container" | indent 8 }}
       containers:
         - name: congress-ds-create
-          image: {{ .Values.images.tags.ds_create }}
+          image: {{ .Values.images.tags.congress_ds_create }}
           imagePullPolicy: {{ .Values.images.pull_policy }}
 {{ tuple $envAll $envAll.Values.pod.resources.jobs.ds_create | include "helm-toolkit.snippets.kubernetes_resources" | indent 10 }}
           command:
diff --git a/congress/templates/pod-test.yaml b/congress/templates/pod-test.yaml
index 0fab762cfd..b8e655c816 100644
--- a/congress/templates/pod-test.yaml
+++ b/congress/templates/pod-test.yaml
@@ -27,7 +27,7 @@ spec:
   restartPolicy: Never
   containers:
     - name: {{.Release.Name}}-congress-test
-      image: {{ .Values.images.tags.scripted_test }}
+      image: {{ .Values.images.tags.congress_scripted_test }}
       env:
 {{- with $env := dict "ksUserSecret" .Values.secrets.identity.admin }}
 {{- include "helm-toolkit.snippets.keystone_openrc_env_vars" $env | indent 8 }}
diff --git a/congress/values.yaml b/congress/values.yaml
index 37264a0eeb..cb5254fcdf 100644
--- a/congress/values.yaml
+++ b/congress/values.yaml
@@ -6,17 +6,17 @@ release_group: null
 
 images:
   tags:
-    api: &congress_api docker.io/kolla/ubuntu-source-congress-api:3.0.3
-    datasource: docker.io/kolla/ubuntu-source-congress-datasource:3.0.3
-    policy_engine: docker.io/kolla/ubuntu-source-congress-policy-engine:3.0.3
-    db_init: *congress_api
-    db_sync: *congress_api
-    db_drop: *congress_api
-    ks_user: *congress_api
-    ks_service: *congress_api
-    ks_endpoints: *congress_api
-    ds_create: *congress_api
-    scripted_test: *congress_api
+    congress_api: docker.io/kolla/ubuntu-source-congress-api:3.0.3
+    congress_datasource: docker.io/kolla/ubuntu-source-congress-datasource:3.0.3
+    congress_policy_engine: docker.io/kolla/ubuntu-source-congress-policy-engine:3.0.3
+    db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    congress_db_sync: docker.io/kolla/ubuntu-source-congress-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
+    congress_ds_create: docker.io/kolla/ubuntu-source-congress-api:3.0.3
+    congress_scripted_test: docker.io/kolla/ubuntu-source-congress-api:3.0.3
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
   pull_policy: "IfNotPresent"