diff --git a/roles/defaults/vars/main.yml b/roles/defaults/vars/main.yml
index 4515aac..93fad33 100644
--- a/roles/defaults/vars/main.yml
+++ b/roles/defaults/vars/main.yml
@@ -175,6 +175,7 @@
   nova_service_cleaner: "registry.atmosphere.dev/library/heat:{{ atmosphere_release }}"
   nova_spiceproxy_assets: "registry.atmosphere.dev/library/nova:{{ atmosphere_release }}"
   nova_spiceproxy: "registry.atmosphere.dev/library/nova:{{ atmosphere_release }}"
+  nova_storage_init: "registry.atmosphere.dev/library/heat:{{ atmosphere_release }}"
   oauth2_proxy: quay.io/oauth2-proxy/oauth2-proxy:v7.6.0
   octavia_api: "registry.atmosphere.dev/library/octavia:{{ atmosphere_release }}"
   octavia_db_sync: "registry.atmosphere.dev/library/octavia:{{ atmosphere_release }}"
diff --git a/roles/neutron/vars/main.yml b/roles/neutron/vars/main.yml
index db99e6e..c5dd507 100644
--- a/roles/neutron/vars/main.yml
+++ b/roles/neutron/vars/main.yml
@@ -69,7 +69,6 @@
         vpn_device_driver: neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
     metadata_agent:
       DEFAULT:
-        nova_metadata_port: 8775
         metadata_proxy_shared_secret: "{{ openstack_helm_endpoints['compute_metadata']['secret'] }}"
     plugins:
       ml2_conf:
diff --git a/roles/nova/vars/main.yml b/roles/nova/vars/main.yml
index b9fb880..71d980e 100644
--- a/roles/nova/vars/main.yml
+++ b/roles/nova/vars/main.yml
@@ -111,6 +111,7 @@
       os_vif_ovs:
         ovsdb_connection: unix:/run/openvswitch/db.sock
       scheduler:
+        max_attempts: 3
         workers: 8
         discover_hosts_in_cells_interval: 30
       vnc:
@@ -121,6 +122,20 @@
     nova_ironic:
       DEFAULT:
         force_config_drive: true
+    nova_api_uwsgi:
+      uwsgi:
+        chunked-input-limit: "4096000"
+        http-auto-chunked: true
+        http-raw-body: true
+        need-app: true
+        socket-timeout: 10
+    nova_metadata_uwsgi:
+      uwsgi:
+        chunked-input-limit: "4096000"
+        http-auto-chunked: true
+        http-raw-body: true
+        need-app: true
+        socket-timeout: 10
   manifests:
     deployment_consoleauth: false
     deployment_placement: false
@@ -128,16 +143,19 @@
     ingress_novncproxy: false
     ingress_osapi: false
     ingress_placement: false
+    ingress_spiceproxy: false
     job_db_init_placement: false
     job_ks_placement_endpoints: false
     job_ks_placement_service: false
     job_ks_placement_user: false
+    job_storage_init: false
     secret_keystone_placement: false
     service_ingress_metadata: false
     service_ingress_novncproxy: false
     service_ingress_osapi: false
     service_ingress_placement: false
     service_placement: false
+    service_ingress_spiceproxy: false
     # NOTE(mnaser): Enable this once we've got Ironic deployed.
     statefulset_compute_ironic: false