diff --git a/ceilometer/values.yaml b/ceilometer/values.yaml
index 18e08caf56..2e787580ce 100644
--- a/ceilometer/values.yaml
+++ b/ceilometer/values.yaml
@@ -43,9 +43,9 @@ images:
     db_init_mongodb: docker.io/mongo:3.4.9-jessie
     db_init: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3
     db_sync: docker.io/kolla/ubuntu-source-ceilometer-api:3.0.3
-    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
+    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: quay.io/larryrensing/ubuntu-source-ceilometer-api:3.0.3
     central: quay.io/larryrensing/ubuntu-source-ceilometer-central:3.0.3
     collector: quay.io/larryrensing/ubuntu-source-ceilometer-collector:3.0.3
diff --git a/gnocchi/values.yaml b/gnocchi/values.yaml
index bb76e59940..f469857902 100644
--- a/gnocchi/values.yaml
+++ b/gnocchi/values.yaml
@@ -15,9 +15,9 @@ images:
     # an indexer
     db_init_keystone: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
     db_sync: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
-    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
+    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: quay.io/attcomdev/ubuntu-source-gnocchi-api:3.0.3
     statsd: quay.io/attcomdev/ubuntu-source-gnocchi-statsd:3.0.3
     metricd: quay.io/attcomdev/ubuntu-source-gnocchi-metricd:3.0.3
diff --git a/rally/values.yaml b/rally/values.yaml
index b314fd647e..63c2932e2f 100644
--- a/rally/values.yaml
+++ b/rally/values.yaml
@@ -23,9 +23,9 @@ images:
     db_init: docker.io/kolla/ubuntu-source-rally:3.0.3
     manage_db: docker.io/kolla/ubuntu-source-rally:3.0.3
     run_task: docker.io/kolla/ubuntu-source-rally:3.0.3
-    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
+    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-rally:3.0.3
   pull_policy: "IfNotPresent"