diff --git a/tools/deployment/multinode/900-tempest.sh b/tools/deployment/multinode/900-tempest.sh
index 68d114fb18..e95f82a7c0 100755
--- a/tools/deployment/multinode/900-tempest.sh
+++ b/tools/deployment/multinode/900-tempest.sh
@@ -83,7 +83,9 @@ envsubst < /tmp/tempest.yaml
 
 helm upgrade --install tempest ./tempest \
   --namespace=openstack \
-  --values=/tmp/tempest.yaml
+  --values=/tmp/tempest.yaml \
+  ${OSH_EXTRA_HELM_ARGS} \
+  ${OSH_EXTRA_HELM_ARGS_TEMPEST}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack 2400
diff --git a/tools/overrides/releases/newton/kolla.yaml b/tools/overrides/releases/newton/kolla.yaml
index 2e201142f5..ae64444ead 100644
--- a/tools/overrides/releases/newton/kolla.yaml
+++ b/tools/overrides/releases/newton/kolla.yaml
@@ -82,6 +82,7 @@ images:
     senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:3.0.3'
     senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:3.0.3'
     senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3'
+    senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:3.0.3'
     tempest: 'docker.io/kolla/ubuntu-source-tempest:3.0.3'
     test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
 pod:
diff --git a/tools/overrides/releases/ocata/kolla.yaml b/tools/overrides/releases/ocata/kolla.yaml
index 96b9a7a879..73c1ce25de 100644
--- a/tools/overrides/releases/ocata/kolla.yaml
+++ b/tools/overrides/releases/ocata/kolla.yaml
@@ -79,6 +79,7 @@ images:
     senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:ocata'
     senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:ocata'
     senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata'
+    senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:ocata'
     tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3'
     test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
 pod:
diff --git a/tools/overrides/releases/ocata/loci.yaml b/tools/overrides/releases/ocata/loci.yaml
index e71a63f734..b5a641be41 100644
--- a/tools/overrides/releases/ocata/loci.yaml
+++ b/tools/overrides/releases/ocata/loci.yaml
@@ -77,5 +77,6 @@ images:
     senlin_api: 'docker.io/openstackhelm/senlin:ocata'
     senlin_db_sync: 'docker.io/openstackhelm/senlin:ocata'
     senlin_engine: 'docker.io/openstackhelm/senlin:ocata'
+    senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:ocata'
     tempest: 'docker.io/kolla/ubuntu-source-tempest:4.0.3'
     test: 'docker.io/kolla/ubuntu-source-rally:4.0.0'
diff --git a/tools/overrides/releases/pike/kolla.yaml b/tools/overrides/releases/pike/kolla.yaml
index f750fcfe18..6a559b0dff 100644
--- a/tools/overrides/releases/pike/kolla.yaml
+++ b/tools/overrides/releases/pike/kolla.yaml
@@ -62,6 +62,7 @@ images:
     neutron_server: 'docker.io/kolla/ubuntu-source-neutron-server:pike'
     nova_api: 'docker.io/kolla/ubuntu-source-nova-api:pike'
     nova_cell_setup: 'docker.io/kolla/ubuntu-source-nova-api:pike'
+    nova_cell_setup_init: 'docker.io/kolla/ubuntu-source-nova-api:pike'
     nova_compute: 'docker.io/kolla/ubuntu-source-nova-compute:pike'
     nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:pike'
     nova_compute_ssh: 'docker.io/kolla/ubuntu-source-nova-ssh:pike'
@@ -78,6 +79,7 @@ images:
     senlin_api: 'docker.io/kolla/ubuntu-source-senlin-api:pike'
     senlin_db_sync: 'docker.io/kolla/ubuntu-source-senlin-api:pike'
     senlin_engine: 'docker.io/kolla/ubuntu-source-senlin-engine:pike'
+    senlin_engine_cleaner: 'docker.io/kolla/ubuntu-source-senlin-engine:pike'
     tempest: 'docker.io/kolla/ubuntu-source-tempest:pike'
     test: 'docker.io/kolla/ubuntu-source-rally:pike'
 pod:
diff --git a/tools/overrides/releases/pike/loci.yaml b/tools/overrides/releases/pike/loci.yaml
index b63a39f736..f32e974b4c 100644
--- a/tools/overrides/releases/pike/loci.yaml
+++ b/tools/overrides/releases/pike/loci.yaml
@@ -60,6 +60,7 @@ images:
     neutron_sriov_agent_init: 'docker.io/openstackhelm/neutron:pike-sriov-1804'
     nova_api: 'docker.io/openstackhelm/nova:pike'
     nova_cell_setup: 'docker.io/openstackhelm/nova:pike'
+    nova_cell_setup_init: 'docker.io/openstackhelm/heat:pike'
     nova_compute: 'docker.io/openstackhelm/nova:pike'
     nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:pike'
     nova_compute_ssh: 'docker.io/openstackhelm/nova:pike'
@@ -76,5 +77,6 @@ images:
     senlin_api: 'docker.io/openstackhelm/senlin:pike'
     senlin_db_sync: 'docker.io/openstackhelm/senlin:pike'
     senlin_engine: 'docker.io/openstackhelm/senlin:pike'
+    senlin_engine_cleaner: 'docker.io/openstackhelm/senlin:pike'
     tempest: 'docker.io/kolla/ubuntu-source-tempest:pike'
     test: 'docker.io/kolla/ubuntu-source-rally:pike'