diff --git a/elasticsearch/values.yaml b/elasticsearch/values.yaml
index a4411d404..f9e481bec 100644
--- a/elasticsearch/values.yaml
+++ b/elasticsearch/values.yaml
@@ -19,16 +19,16 @@
 images:
   tags:
     apache_proxy: docker.io/httpd:2.4
-    memory_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    memory_init: docker.io/openstackhelm/heat:newton
     curator:  docker.io/bobrik/curator:5.2.0
     elasticsearch: docker.io/srwilkers/elasticsearch-s3:v0.1.0
     ceph_key_placement: docker.io/port/ceph-config-helper:v1.10.3
     s3_bucket: docker.io/port/ceph-config-helper:v1.10.3
     s3_user: docker.io/port/ceph-config-helper:v1.10.3
-    helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    helm_tests: docker.io/openstackhelm/heat:newton
     prometheus_elasticsearch_exporter: docker.io/justwatch/elasticsearch_exporter:1.0.1
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    snapshot_repository: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    snapshot_repository: docker.io/openstackhelm/heat:newton
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
   local_registry:
diff --git a/fluent-logging/values.yaml b/fluent-logging/values.yaml
index 5b1c2816a..51c924a69 100644
--- a/fluent-logging/values.yaml
+++ b/fluent-logging/values.yaml
@@ -43,8 +43,8 @@ images:
     fluentd: docker.io/fluent/fluentd-kubernetes-daemonset:v1.2-debian-elasticsearch
     prometheus_fluentd_exporter: docker.io/srwilkers/fluentd_exporter:v0.1
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    elasticsearch_template: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    helm_tests: docker.io/openstackhelm/heat:newton
+    elasticsearch_template: docker.io/openstackhelm/heat:newton
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
   local_registry:
diff --git a/grafana/values.yaml b/grafana/values.yaml
index 2c0bcf726..d374ca4d8 100644
--- a/grafana/values.yaml
+++ b/grafana/values.yaml
@@ -20,9 +20,9 @@ images:
   tags:
     grafana: docker.io/grafana/grafana:5.0.0
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
-    db_init: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    grafana_db_session_sync: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
-    helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    db_init: docker.io/openstackhelm/heat:newton
+    grafana_db_session_sync: docker.io/openstackhelm/heat:newton
+    helm_tests: docker.io/openstackhelm/heat:newton
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent
   local_registry:
diff --git a/prometheus-openstack-exporter/values.yaml b/prometheus-openstack-exporter/values.yaml
index 21ec55125..f1e9d47b9 100644
--- a/prometheus-openstack-exporter/values.yaml
+++ b/prometheus-openstack-exporter/values.yaml
@@ -21,7 +21,7 @@ images:
     prometheus_openstack_exporter: quay.io/attcomdev/prometheus-openstack-exporter:3231f14419f0c47547ce2551b7d884cd222104e6
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     image_repo_sync: docker.io/docker:17.07.0
-    ks_user: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    ks_user: docker.io/openstackhelm/heat:newton
   pull_policy: IfNotPresent
   local_registry:
     active: false
diff --git a/prometheus/values.yaml b/prometheus/values.yaml
index 09b2fa0ff..c0a7ef002 100644
--- a/prometheus/values.yaml
+++ b/prometheus/values.yaml
@@ -21,7 +21,7 @@ images:
   tags:
     apache_proxy: docker.io/httpd:2.4
     prometheus: docker.io/prom/prometheus:v2.3.2
-    helm_tests: docker.io/kolla/ubuntu-source-heat-engine:3.0.3
+    helm_tests: docker.io/openstackhelm/heat:newton
     dep_check: quay.io/stackanetes/kubernetes-entrypoint:v0.3.1
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: IfNotPresent