diff --git a/charts/promenade/values.yaml b/charts/promenade/values.yaml
index 7764ff74..f86dc76e 100644
--- a/charts/promenade/values.yaml
+++ b/charts/promenade/values.yaml
@@ -35,9 +35,9 @@ images:
   tags:
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
     promenade: quay.io/attcomdev/promenade:latest
-    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
+    ks_user: docker.io/openstackhelm/heat:newton
+    ks_service: docker.io/openstackhelm/heat:newton
+    ks_endpoints: docker.io/openstackhelm/heat:newton
   pull_policy: IfNotPresent
 
 labels:
diff --git a/examples/complete/armada-resources.yaml b/examples/complete/armada-resources.yaml
index 151f5184..83bff585 100644
--- a/examples/complete/armada-resources.yaml
+++ b/examples/complete/armada-resources.yaml
@@ -1222,9 +1222,9 @@ data:
         ceph_rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1
         ceph_cephfs_provisioner: quay.io/external_storage/cephfs-provisioner:v0.1.1
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
   source:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm
@@ -1268,9 +1268,9 @@ data:
         ceph_daemon: docker.io/ceph/daemon:tag-build-master-luminous-ubuntu-16.04
         ceph_rbd_provisioner: quay.io/external_storage/rbd-provisioner:v0.1.1
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
     labels:
       job:
         node_selector_key: ucp-control-plane
@@ -1408,9 +1408,9 @@ data:
         override:
     images:
       tags:
-        bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        bootstrap: docker.io/openstackhelm/heat:newton
+        db_drop: docker.io/openstackhelm/heat:newton
+        db_init: docker.io/openstackhelm/heat:newton
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
         keystone_api: docker.io/kolla/ubuntu-source-keystone:3.0.3
         keystone_credential_rotate: docker.io/kolla/ubuntu-source-keystone:3.0.3
@@ -1626,14 +1626,14 @@ data:
       tags:
         barbican_api: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
         barbican_db_sync: docker.io/kolla/ubuntu-source-barbican-api:3.0.3
-        bootstrap: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        db_drop: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        bootstrap: docker.io/openstackhelm/heat:newton
+        db_drop: docker.io/openstackhelm/heat:newton
+        db_init: docker.io/openstackhelm/heat:newton
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        scripted_test: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
+        scripted_test: docker.io/openstackhelm/heat:newton
   source:
     type: git
     location: https://git.openstack.org/openstack/openstack-helm
@@ -1739,9 +1739,9 @@ data:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
         db_init: docker.io/postgres:9.5
         db_sync: docker.io/postgres:9.5
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
     labels:
       node_selector_key: ucp-control-plane
       node_selector_value: enabled
@@ -1784,9 +1784,9 @@ data:
         drydock: quay.io/attcomdev/drydock:latest
         drydock_db_init: docker.io/postgres:9.5
         drydock_db_sync: quay.io/attcomdev/drydock:latest
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
     labels:
       node_selector_key: ucp-control-plane
       node_selector_value: enabled
@@ -1843,9 +1843,9 @@ data:
     images:
       tags:
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
         promenade: quay.io/attcomdev/promenade:latest
   upgrade:
     no_hooks: true
@@ -1884,9 +1884,9 @@ data:
       tags:
         api: quay.io/attcomdev/armada:latest
         dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.2.1
-        ks_endpoints: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_service: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-        ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+        ks_endpoints: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_user: docker.io/openstackhelm/heat:newton
     labels:
       node_selector_key: ucp-control-plane
       node_selector_value: enabled
@@ -1941,9 +1941,9 @@ data:
         shipyard_db_sync: quay.io/attcomdev/shipyard:latest
         airflow_db_init: docker.io/postgres:9.5
         airflow_db_sync: quay.io/attcomdev/airflow:latest
-        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
+        ks_user: docker.io/openstackhelm/heat:newton
+        ks_service: docker.io/openstackhelm/heat:newton
+        ks_endpoints: docker.io/openstackhelm/heat:newton
     labels:
       node_selector_key: ucp-control-plane
       node_selector_value: enabled