diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index 023058aca2..ffc9ca800e 100644
--- a/nova/Chart.yaml
+++ b/nova/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Nova
 name: nova
-version: 0.2.32
+version: 0.2.33
 home: https://docs.openstack.org/nova/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Nova/OpenStack_Project_Nova_vertical.png
 sources:
diff --git a/nova/values.yaml b/nova/values.yaml
index 7d4c1e589c..597db82261 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -60,33 +60,33 @@ labels:
 images:
   pull_policy: IfNotPresent
   tags:
-    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    bootstrap: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    db_init: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     rabbit_init: docker.io/rabbitmq:3.7-management
-    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    nova_archive_deleted_rows: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    nova_api: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_cell_setup: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_cell_setup_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    nova_compute: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+    ks_user: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    nova_archive_deleted_rows: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    nova_api: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_cell_setup: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_cell_setup_init: docker.io/openstackhelm/heat:ussuri-ubuntu_bionic
+    nova_compute: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
     nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
-    nova_compute_ssh: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_conductor: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_consoleauth: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_db_sync: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_novncproxy: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+    nova_compute_ssh: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_conductor: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_consoleauth: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_db_sync: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_novncproxy: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
     nova_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:ocata'
-    nova_placement: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_scheduler: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+    nova_placement: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_scheduler: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
     # NOTE(portdirect): we simply use the ceph config helper here,
     # as it has both oscli and jq.
     nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
-    nova_spiceproxy: docker.io/openstackhelm/nova:stein-ubuntu_bionic
-    nova_spiceproxy_assets: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+    nova_spiceproxy: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
+    nova_spiceproxy_assets: docker.io/openstackhelm/nova:ussuri-ubuntu_bionic
     test: docker.io/xrally/xrally-openstack:2.0.0
     image_repo_sync: docker.io/docker:17.07.0
     nova_wait_for_computes_init: gcr.io/google_containers/hyperkube-amd64:v1.11.6
diff --git a/nova/values_overrides/ocata-ubuntu_xenial.yaml b/nova/values_overrides/ocata-ubuntu_xenial.yaml
deleted file mode 100644
index 859f6ce164..0000000000
--- a/nova/values_overrides/ocata-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    nova_api: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_cell_setup: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_cell_setup_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
-    nova_compute: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_compute_ssh: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_conductor: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_consoleauth: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_db_sync: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_novncproxy: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_novncproxy_assets: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_placement: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_scheduler: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_spiceproxy: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:ocata-ubuntu_xenial"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/nova/values_overrides/pike-ubuntu_xenial.yaml b/nova/values_overrides/pike-ubuntu_xenial.yaml
deleted file mode 100644
index 0cd4991a66..0000000000
--- a/nova/values_overrides/pike-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    nova_api: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_cell_setup: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_cell_setup_init: "docker.io/openstackhelm/heat:pike-ubuntu_xenial"
-    nova_compute: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
-    nova_compute_ssh: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_conductor: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_consoleauth: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_db_sync: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_novncproxy: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_novncproxy_assets: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_placement: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_scheduler: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    # nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
-    nova_spiceproxy: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:pike-ubuntu_xenial"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/nova/values_overrides/queens-ubuntu_xenial.yaml b/nova/values_overrides/queens-ubuntu_xenial.yaml
deleted file mode 100644
index 65cc753e50..0000000000
--- a/nova/values_overrides/queens-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    nova_api: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_cell_setup: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_cell_setup_init: "docker.io/openstackhelm/heat:queens-ubuntu_xenial"
-    nova_compute: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
-    nova_compute_ssh: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_conductor: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_consoleauth: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_db_sync: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_novncproxy: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_novncproxy_assets: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_placement: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_scheduler: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    # nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
-    nova_spiceproxy: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:queens-ubuntu_xenial"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/nova/values_overrides/rocky-opensuse_15.yaml b/nova/values_overrides/rocky-opensuse_15.yaml
deleted file mode 100644
index 88d2d2158d..0000000000
--- a/nova/values_overrides/rocky-opensuse_15.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    db_drop: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    db_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_user: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_service: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    nova_api: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_cell_setup: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_cell_setup_init: "docker.io/openstackhelm/heat:rocky-opensuse_15"
-    nova_compute: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
-    nova_compute_ssh: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_conductor: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_consoleauth: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_db_sync: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_novncproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_placement: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_scheduler: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    # nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
-    nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-opensuse_15"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-opensuse_15"
-...
diff --git a/nova/values_overrides/rocky-ubuntu_bionic.yaml b/nova/values_overrides/rocky-ubuntu_bionic.yaml
deleted file mode 100644
index 505b0dfbbd..0000000000
--- a/nova/values_overrides/rocky-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    nova_api: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_cell_setup: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_cell_setup_init: "docker.io/openstackhelm/heat:rocky-ubuntu_bionic"
-    nova_compute: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:rocky'
-    nova_compute_ssh: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_conductor: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_consoleauth: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_db_sync: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_novncproxy: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_placement: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_scheduler: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    # nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
-    nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_bionic"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/nova/values_overrides/rocky-ubuntu_xenial.yaml b/nova/values_overrides/rocky-ubuntu_xenial.yaml
deleted file mode 100644
index 3b5c18e1fa..0000000000
--- a/nova/values_overrides/rocky-ubuntu_xenial.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    db_drop: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    db_init: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_user: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_service: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    ks_endpoints: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    nova_api: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_cell_setup: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_cell_setup_init: "docker.io/openstackhelm/heat:rocky-ubuntu_xenial"
-    nova_compute: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:rocky'
-    nova_compute_ssh: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_conductor: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_consoleauth: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_db_sync: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_novncproxy: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_novncproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_placement: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_scheduler: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    # nova_service_cleaner: 'docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial'
-    nova_spiceproxy: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:rocky-ubuntu_xenial"
-    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
-...
diff --git a/nova/values_overrides/stein.yaml b/nova/values_overrides/stein.yaml
deleted file mode 100644
index 602155448a..0000000000
--- a/nova/values_overrides/stein.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-manifests:
-  # NOTE(lamt): Placement code was extracted from nova post Stein.
-  # A placement chart will need to be deployed to replace.
-  # See: https://docs.openstack.org/releasenotes/nova/train.html
-  deployment_placement: false
-  ingress_placement: false
-  job_db_init_placement: false
-  job_ks_placement_endpoints: false
-  job_ks_placement_service: false
-  job_ks_placement_user: false
-  pdb_placement: false
-  secret_keystone_placement: false
-  service_ingress_placement: false
-  service_placement: false
-...
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 518af5ec96..c5825bd96a 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -53,4 +53,5 @@ nova:
   - 0.2.30 Improve health probe logging
   - 0.2.31 Update oslo messaging get_transport
   - 0.2.32 Host of ironic compute service equals pod name
+  - 0.2.33 Cleanup old releases
 ...