diff --git a/tools/deployment/baremetal/110-compute-kit.sh b/tools/deployment/baremetal/110-compute-kit.sh
index bfa1768448..d2dc86957d 100755
--- a/tools/deployment/baremetal/110-compute-kit.sh
+++ b/tools/deployment/baremetal/110-compute-kit.sh
@@ -66,10 +66,11 @@ conf:
       ovs:
         bridge_mappings: "external:br-ex,${OSH_IRONIC_PXE_PYSNET}:${OSH_IRONIC_PXE_DEV}"
 EOF
-helm install ./neutron \
+helm upgrade --install neutron ./neutron \
     --namespace=openstack \
-    --name=neutron \
-    --values=/tmp/neutron.yaml
+    --values=/tmp/neutron.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NEUTRON}
 
 tee /tmp/ironic.yaml << EOF
 labels:
@@ -81,15 +82,18 @@ network:
     neutron_provider_network: "${OSH_IRONIC_PXE_PYSNET}"
 conf:
   ironic:
+    DEFAULT:
+      debug: true
     conductor:
       automated_clean: "false"
     deploy:
       shred_final_overwrite_with_zeros: "false"
 EOF
-helm install ./ironic \
+helm upgrade --install ironic ./ironic \
     --namespace=openstack \
-    --name=ironic \
-    --values=/tmp/ironic.yaml
+    --values=/tmp/ironic.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_IRONIC}
 
 tee /tmp/nova.yaml << EOF
 labels:
@@ -100,27 +104,33 @@ labels:
 conf:
   nova:
     DEFAULT:
-      force_config_drive: false
+      debug: true
+      #force_config_drive: false
       scheduler_host_manager: ironic_host_manager
       compute_driver: ironic.IronicDriver
-      ram_allocation_ratio: 1.0
+      firewall_driver: nova.virt.firewall.NoopFirewallDriver
+      #ram_allocation_ratio: 1.0
       reserved_host_memory_mb: 0
       scheduler_use_baremetal_filters: true
       baremetal_scheduler_default_filters: "RetryFilter,AvailabilityZoneFilter,ComputeFilter,ComputeCapabilitiesFilter"
+    filter_scheduler:
       scheduler_tracks_instance_changes: false
-      scheduler_host_subset_size: 9999
+      #scheduler_host_subset_size: 9999
+    scheduler:
+      discover_hosts_in_cells_interval: 120
 manifests:
-  cron_job_cell_setup: false
+  cron_job_cell_setup: true
   daemonset_compute: false
   daemonset_libvirt: false
   statefulset_compute_ironic: true
-  job_cell_setup: false
+  job_cell_setup: true
 EOF
-# Deploy Nova and enable the neutron agents
-helm install ./nova \
+# Deploy Nova
+helm upgrade --install nova ./nova \
     --namespace=openstack \
-    --name=nova \
-    --values=/tmp/nova.yaml
+    --values=/tmp/nova.yaml \
+    ${OSH_EXTRA_HELM_ARGS} \
+    ${OSH_EXTRA_HELM_ARGS_NOVA}
 
 #NOTE: Wait for deploy
 ./tools/deployment/common/wait-for-pods.sh openstack