diff --git a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml
index 9f2a01f9..8ba03fe4 100644
--- a/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml
+++ b/deployment_files/global/v1.0demo/software/charts/osh/component-infrastructure/heat.yaml
@@ -30,6 +30,10 @@ data:
     timeout: 1800
     labels:
       release_group: airship-heat
+  test:
+    enabled: true
+    options:
+      cleanup: false
   install:
     no_hooks: false
   upgrade:
diff --git a/deployment_files/global/v1.0demo/software/config/versions.yaml b/deployment_files/global/v1.0demo/software/config/versions.yaml
index 4a50fa26..177a4c19 100644
--- a/deployment_files/global/v1.0demo/software/config/versions.yaml
+++ b/deployment_files/global/v1.0demo/software/config/versions.yaml
@@ -611,6 +611,7 @@ data:
         dep_check: *dep_check
         rabbit_init: *rabbitmq
       heat:
+        test: *rally_test
         bootstrap: *heat
         db_init: *heat
         heat_db_sync: *heat
@@ -654,7 +655,7 @@ data:
         dep_check: *dep_check
       mariadb:
         mariadb: *mariadb_db
-        ingress: *ingress_controller
+        ingress: quay.io/kubernetes-ingress-controller/nginx-ingress-controller:0.9.0
         error_pages: *ingress_error_pages
         prometheus_create_mysql_user: *mariadb_db
         prometheus_mysql_exporter: docker.io/prom/mysqld-exporter:v0.10.0