diff --git a/barbican/values.yaml b/barbican/values.yaml
index b784bb27ad..e12f89b6ce 100644
--- a/barbican/values.yaml
+++ b/barbican/values.yaml
@@ -30,16 +30,16 @@ release_group: null
 
 images:
   tags:
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
-    scripted_test: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    barbican_db_sync: docker.io/openstackhelm/barbican:ocata-ubuntu_xenial
-    db_drop: 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
-    barbican_api: docker.io/openstackhelm/barbican:ocata-ubuntu_xenial
+    scripted_test: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    barbican_db_sync: docker.io/openstackhelm/barbican:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    barbican_api: docker.io/openstackhelm/barbican:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
@@ -407,6 +407,10 @@ conf:
     secretstore_preferred:post: rule:admin
     secretstore_preferred:delete: rule:admin
     secretstore:get: rule:admin
+    secret_project_match: project_id:%(target.secret.project_id)s
+    secret_creator_user: user_id:%(target.secret.creator_id)s
+    container_project_match: project_id:%(target.container.project_id)s
+    container_creator_user: user_id:%(target.container.creator_id)s
   audit_map:
     DEFAULT:
       # default target endpoint type
diff --git a/barbican/values_overrides/ocata-ubuntu_xenial.yaml b/barbican/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..cb18865135
--- /dev/null
+++ b/barbican/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,12 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    scripted_test: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    barbican_db_sync: "docker.io/openstackhelm/barbican:ocata-ubuntu_xenial"
+    db_drop: "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"
+    barbican_api: "docker.io/openstackhelm/barbican:ocata-ubuntu_xenial"
diff --git a/barbican/values_overrides/stein-ubuntu_bionic.yaml b/barbican/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index f8bd66e9ee..0000000000
--- a/barbican/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    scripted_test: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    barbican_db_sync: "docker.io/openstackhelm/barbican:stein-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    barbican_api: "docker.io/openstackhelm/barbican:stein-ubuntu_bionic"
diff --git a/barbican/values_overrides/stein.yaml b/barbican/values_overrides/stein.yaml
deleted file mode 100644
index 3e278010ec..0000000000
--- a/barbican/values_overrides/stein.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-conf:
-  policy:
-    secret_project_match: project_id:%(target.secret.project_id)s
-    secret_creator_user: user_id:%(target.secret.creator_id)s
-    container_project_match: project_id:%(target.container.project_id)s
-    container_creator_user: user_id:%(target.container.creator_id)s
diff --git a/cinder/values.yaml b/cinder/values.yaml
index 8f472bffda..d530679a2e 100644
--- a/cinder/values.yaml
+++ b/cinder/values.yaml
@@ -44,20 +44,20 @@ release_group: null
 images:
   tags:
     test: docker.io/xrally/xrally-openstack:1.3.0
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    cinder_db_sync: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
-    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    cinder_db_sync: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
-    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
-    cinder_api: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    cinder_scheduler: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
-    cinder_volume: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
-    cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    cinder_api: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
+    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    cinder_scheduler: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
+    cinder_volume: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
+    cinder_volume_usage_audit: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
     cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
-    cinder_backup: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    cinder_backup: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
     cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
@@ -840,7 +840,7 @@ conf:
       # - cinder.backup.drivers.swift.SwiftBackupDriver
       # - cinder.backup.drivers.ceph.CephBackupDriver
       # - cinder.backup.drivers.posix.PosixBackupDriver
-      backup_driver: "cinder.backup.drivers.swift"
+      backup_driver: "cinder.backup.drivers.swift.SwiftBackupDriver"
       # Backup: Ceph RBD options
       backup_ceph_conf: "/etc/ceph/ceph.conf"
       backup_ceph_user: cinderbackup
diff --git a/cinder/values_overrides/ocata-ubuntu_xenial.yaml b/cinder/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..9d2734292c
--- /dev/null
+++ b/cinder/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,17 @@
+---
+images:
+  tags:
+    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    cinder_db_sync: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    db_drop: 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
+    cinder_api: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    cinder_scheduler: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    cinder_volume: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    cinder_volume_usage_audit: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
+    cinder_backup: docker.io/openstackhelm/cinder:ocata-ubuntu_xenial
+    cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
diff --git a/cinder/values_overrides/ocata.yaml b/cinder/values_overrides/ocata.yaml
new file mode 100644
index 0000000000..aa59dd37a2
--- /dev/null
+++ b/cinder/values_overrides/ocata.yaml
@@ -0,0 +1,10 @@
+# NOTE(lamt): The backup_driver name after Stein requires a full class name.
+# (e.g. cinder.backup.drivers.swift.SwiftBackupDriver).
+# Prior to Stein, this name was just set to the package name, e.g.
+#   - cinder.backup.drivers.swift
+#   - cinder.backup.drivers.ceph
+#   - cinder.backup.drivers.posix
+conf:
+  cinder:
+    DEFAULT:
+      backup_driver: "cinder.backup.drivers.swift"
diff --git a/cinder/values_overrides/pike.yaml b/cinder/values_overrides/pike.yaml
new file mode 100644
index 0000000000..aa59dd37a2
--- /dev/null
+++ b/cinder/values_overrides/pike.yaml
@@ -0,0 +1,10 @@
+# NOTE(lamt): The backup_driver name after Stein requires a full class name.
+# (e.g. cinder.backup.drivers.swift.SwiftBackupDriver).
+# Prior to Stein, this name was just set to the package name, e.g.
+#   - cinder.backup.drivers.swift
+#   - cinder.backup.drivers.ceph
+#   - cinder.backup.drivers.posix
+conf:
+  cinder:
+    DEFAULT:
+      backup_driver: "cinder.backup.drivers.swift"
diff --git a/cinder/values_overrides/queens.yaml b/cinder/values_overrides/queens.yaml
new file mode 100644
index 0000000000..aa59dd37a2
--- /dev/null
+++ b/cinder/values_overrides/queens.yaml
@@ -0,0 +1,10 @@
+# NOTE(lamt): The backup_driver name after Stein requires a full class name.
+# (e.g. cinder.backup.drivers.swift.SwiftBackupDriver).
+# Prior to Stein, this name was just set to the package name, e.g.
+#   - cinder.backup.drivers.swift
+#   - cinder.backup.drivers.ceph
+#   - cinder.backup.drivers.posix
+conf:
+  cinder:
+    DEFAULT:
+      backup_driver: "cinder.backup.drivers.swift"
diff --git a/cinder/values_overrides/rocky.yaml b/cinder/values_overrides/rocky.yaml
new file mode 100644
index 0000000000..aa59dd37a2
--- /dev/null
+++ b/cinder/values_overrides/rocky.yaml
@@ -0,0 +1,10 @@
+# NOTE(lamt): The backup_driver name after Stein requires a full class name.
+# (e.g. cinder.backup.drivers.swift.SwiftBackupDriver).
+# Prior to Stein, this name was just set to the package name, e.g.
+#   - cinder.backup.drivers.swift
+#   - cinder.backup.drivers.ceph
+#   - cinder.backup.drivers.posix
+conf:
+  cinder:
+    DEFAULT:
+      backup_driver: "cinder.backup.drivers.swift"
diff --git a/cinder/values_overrides/stein-ubuntu_bionic.yaml b/cinder/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index 6a9402894d..0000000000
--- a/cinder/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-images:
-  tags:
-    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    cinder_db_sync: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    cinder_api: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
-    cinder_scheduler: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    cinder_volume: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    cinder_volume_usage_audit: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    cinder_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
-    cinder_backup: docker.io/openstackhelm/cinder:stein-ubuntu_bionic
-    cinder_backup_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
diff --git a/cinder/values_overrides/stein.yaml b/cinder/values_overrides/stein.yaml
deleted file mode 100644
index 82df4873b3..0000000000
--- a/cinder/values_overrides/stein.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-conf:
-  cinder:
-    DEFAULT:
-      backup_driver: "cinder.backup.drivers.swift.SwiftBackupDriver"
diff --git a/glance/values.yaml b/glance/values.yaml
index 075d01ee7a..78b4838d73 100644
--- a/glance/values.yaml
+++ b/glance/values.yaml
@@ -39,19 +39,19 @@ release_group: null
 images:
   tags:
     test: docker.io/xrally/xrally-openstack:1.3.0
-    glance_storage_init: docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216
+    glance_storage_init: docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial
     glance_metadefs_load: docker.io/openstackhelm/glance:ocata-ubuntu_xenial
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    glance_db_sync: docker.io/openstackhelm/glance:ocata-ubuntu_xenial
-    db_drop: 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
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    glance_db_sync: docker.io/openstackhelm/glance:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
-    glance_api: docker.io/openstackhelm/glance:ocata-ubuntu_xenial
-    glance_registry: docker.io/openstackhelm/glance:ocata-ubuntu_xenial
+    glance_api: docker.io/openstackhelm/glance:stein-ubuntu_bionic
+    glance_registry: docker.io/openstackhelm/glance:stein-ubuntu_bionic
     # Bootstrap image requires curl
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/glance/values_overrides/ocata-ubuntu_xenial.yaml b/glance/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..21bfebcaec
--- /dev/null
+++ b/glance/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,13 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_drop: "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"
+    glance_db_sync: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
+    glance_api: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
+    glance_registry: "docker.io/openstackhelm/glance:ocata-ubuntu_xenial"
+    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:ubuntu_bionic-20191216"
diff --git a/glance/values_overrides/stein-ubuntu_bionic.yaml b/glance/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index b4db0c286a..0000000000
--- a/glance/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    glance_db_sync: "docker.io/openstackhelm/glance:stein-ubuntu_bionic"
-    glance_api: "docker.io/openstackhelm/glance:stein-ubuntu_bionic"
-    glance_registry: "docker.io/openstackhelm/glance:stein-ubuntu_bionic"
-    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
diff --git a/heat/values.yaml b/heat/values.yaml
index 819e1fcfa5..282c17a9f7 100644
--- a/heat/values.yaml
+++ b/heat/values.yaml
@@ -42,20 +42,20 @@ labels:
 images:
   tags:
     test: docker.io/xrally/xrally-openstack:1.3.0
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    heat_db_sync: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_db_sync: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
-    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
-    heat_api: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    heat_cfn: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    heat_cloudwatch: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    heat_engine: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    heat_engine_cleaner: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    heat_purge_deleted: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_api: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_cfn: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_cloudwatch: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_engine: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_engine_cleaner: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    heat_purge_deleted: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/heat/values_overrides/ocata-ubuntu_xenial.yaml b/heat/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..f8fe39f8cb
--- /dev/null
+++ b/heat/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,16 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_drop: "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"
+    heat_db_sync: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    heat_api: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    heat_cfn: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    heat_cloudwatch: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    heat_engine: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    heat_engine_cleaner: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    heat_purge_deleted: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
diff --git a/heat/values_overrides/stein-ubuntu_bionic.yaml b/heat/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index 0450d7e1c9..0000000000
--- a/heat/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_db_sync: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_api: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_cfn: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_cloudwatch: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_engine: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_engine_cleaner: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    heat_purge_deleted: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
diff --git a/horizon/values.yaml b/horizon/values.yaml
index ee6844ff4b..46c8638edf 100644
--- a/horizon/values.yaml
+++ b/horizon/values.yaml
@@ -19,10 +19,10 @@
 
 images:
   tags:
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    horizon_db_sync: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial
-    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    horizon: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    horizon_db_sync: docker.io/openstackhelm/horizon:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    horizon: docker.io/openstackhelm/horizon:stein-ubuntu_bionic
     test: docker.io/openstackhelm/osh-selenium:latest-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
diff --git a/horizon/values_overrides/ocata-ubuntu_xenial.yaml b/horizon/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..5faee9744e
--- /dev/null
+++ b/horizon/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,7 @@
+---
+images:
+  tags:
+    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    horizon_db_sync: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial
+    horizon: docker.io/openstackhelm/horizon:ocata-ubuntu_xenial
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 345ebfc6f3..aeea373469 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -32,20 +32,20 @@ release_group: null
 
 images:
   tags:
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     test: docker.io/xrally/xrally-openstack:1.3.0
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    keystone_db_sync: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
-    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    ks_user: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    keystone_db_sync: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
-    keystone_fernet_setup: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
-    keystone_fernet_rotate: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
-    keystone_credential_setup: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
-    keystone_credential_rotate: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
-    keystone_credential_cleanup: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    keystone_api: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
-    keystone_domain_manage: docker.io/openstackhelm/keystone:ocata-ubuntu_xenial
+    keystone_fernet_setup: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    keystone_fernet_rotate: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    keystone_credential_setup: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    keystone_credential_rotate: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    keystone_credential_cleanup: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    keystone_api: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
+    keystone_domain_manage: docker.io/openstackhelm/keystone:stein-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
diff --git a/keystone/values_overrides/ocata-ubuntu_xenial.yaml b/keystone/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..84eb818ed3
--- /dev/null
+++ b/keystone/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,15 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_drop: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    keystone_api: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    keystone_bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    keystone_credential_rotate: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    keystone_credential_setup: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    keystone_db_sync: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    keystone_domain_manage: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    keystone_fernet_rotate: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    keystone_fernet_setup: "docker.io/openstackhelm/keystone:ocata-ubuntu_xenial"
+    ks_user: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
diff --git a/keystone/values_overrides/stein-ubuntu_bionic.yaml b/keystone/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index e0e1a77587..0000000000
--- a/keystone/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    keystone_api: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    keystone_bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    keystone_credential_rotate: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    keystone_credential_setup: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    keystone_db_sync: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    keystone_domain_manage: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    keystone_fernet_rotate: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    keystone_fernet_setup: "docker.io/openstackhelm/keystone:stein-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
diff --git a/neutron/values.yaml b/neutron/values.yaml
index eec768926d..c85d7470cd 100644
--- a/neutron/values.yaml
+++ b/neutron/values.yaml
@@ -21,27 +21,27 @@ release_group: null
 
 images:
   tags:
-    bootstrap: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    bootstrap: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     test: docker.io/xrally/xrally-openstack:1.3.0
     purge_test: docker.io/openstackhelm/ospurge:latest
-    db_init: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
-    neutron_db_sync: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    db_drop: docker.io/openstackhelm/heat:ocata-ubuntu_xenial
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    neutron_db_sync: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
     rabbit_init: docker.io/rabbitmq:3.7-management
-    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
-    neutron_server: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_dhcp: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_metadata: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_l3: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_l2gw: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_openvswitch_agent: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_linuxbridge_agent: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_sriov_agent: docker.io/openstackhelm/neutron:ocata-18.04-sriov
-    neutron_sriov_agent_init: docker.io/openstackhelm/neutron:ocata-18.04-sriov
-    neutron_bagpipe_bgp: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
-    neutron_ironic_agent: docker.io/openstackhelm/neutron:ocata-ubuntu_xenial
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_endpoints: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    neutron_server: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_dhcp: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_metadata: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_l3: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_l2gw: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_openvswitch_agent: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_linuxbridge_agent: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_sriov_agent: docker.io/openstackhelm/neutron:stein-18.04-sriov
+    neutron_sriov_agent_init: docker.io/openstackhelm/neutron:stein-18.04-sriov
+    neutron_bagpipe_bgp: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
+    neutron_ironic_agent: docker.io/openstackhelm/neutron:stein-ubuntu_bionic
     dep_check: quay.io/airshipit/kubernetes-entrypoint:v1.0.0
     image_repo_sync: docker.io/docker:17.07.0
   pull_policy: "IfNotPresent"
@@ -1047,7 +1047,7 @@ conf:
     filter:extensions:
       paste.filter_factory: neutron.api.extensions:plugin_aware_extension_middleware_factory
     app:neutronversions:
-      paste.app_factory: neutron.api.versions:Versions.factory
+      paste.app_factory: neutron.pecan_wsgi.app:versions_factory
     app:neutronapiapp_v2_0:
       paste.app_factory: neutron.api.v2.router:APIRouter.factory
     filter:osprofiler:
diff --git a/neutron/values_overrides/ocata-ubuntu_xenial.yaml b/neutron/values_overrides/ocata-ubuntu_xenial.yaml
new file mode 100644
index 0000000000..a1083bf345
--- /dev/null
+++ b/neutron/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,18 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_init: "docker.io/openstackhelm/heat:ocata-ubuntu_xenial"
+    db_drop: "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"
+    neutron_db_sync: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_dhcp: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_l3: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_metadata: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_server: "docker.io/openstackhelm/neutron:ocata-ubuntu_xenial"
+    neutron_sriov_agent: docker.io/openstackhelm/neutron:ocata-18.04-sriov
+    neutron_sriov_agent_init: docker.io/openstackhelm/neutron:ocata-18.04-sriov
diff --git a/neutron/values_overrides/rocky.yaml b/neutron/values_overrides/ocata.yaml
similarity index 53%
rename from neutron/values_overrides/rocky.yaml
rename to neutron/values_overrides/ocata.yaml
index f08f676270..49bc361382 100644
--- a/neutron/values_overrides/rocky.yaml
+++ b/neutron/values_overrides/ocata.yaml
@@ -1,9 +1,7 @@
-# Provide release specific overrides for Neutron configuration
-# e.g. removal of obsoleted options
-
 conf:
   # api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens
-  # See https://docs.openstack.org/releasenotes/neutron/queens.html:
+  # See https://docs.openstack.org/releasenotes/neutron/queens.html
+  # This configuration is put in for pre-Queens release.
   paste:
     app:neutronversions:
-      paste.app_factory: neutron.pecan_wsgi.app:versions_factory
+      paste.app_factory: neutron.api.versions:Versions.factory
diff --git a/neutron/values_overrides/pike.yaml b/neutron/values_overrides/pike.yaml
new file mode 100644
index 0000000000..49bc361382
--- /dev/null
+++ b/neutron/values_overrides/pike.yaml
@@ -0,0 +1,7 @@
+conf:
+  # api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens
+  # See https://docs.openstack.org/releasenotes/neutron/queens.html
+  # This configuration is put in for pre-Queens release.
+  paste:
+    app:neutronversions:
+      paste.app_factory: neutron.api.versions:Versions.factory
diff --git a/neutron/values_overrides/stein-ubuntu_bionic.yaml b/neutron/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index 6143b2b50d..0000000000
--- a/neutron/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
----
-images:
-  tags:
-    bootstrap: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_init: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    db_drop: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_endpoints: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    neutron_db_sync: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
-    neutron_dhcp: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
-    neutron_l3: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
-    neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
-    neutron_metadata: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
-    neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
-    neutron_server: "docker.io/openstackhelm/neutron:stein-ubuntu_bionic"
diff --git a/neutron/values_overrides/stein.yaml b/neutron/values_overrides/stein.yaml
deleted file mode 100644
index 6b780bdb12..0000000000
--- a/neutron/values_overrides/stein.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-# Provide release specific overrides for Neutron configuration
-# e.g. removal of obsoleted options
-
-conf:
-  # api-paste entrypoint neutron.api.versions:Versions.factory was deprecated in Queens
-  # See https://docs.openstack.org/releasenotes/neutron/queens.html:
-  paste:
-    app:neutronversions:
-      paste.app_factory: neutron.pecan_wsgi.app:versions_factory
-
-pod:
-  probes:
-    dhcp_agent:
-      dhcp_agent:
-        readiness:
-          enabled: false
-        liveness:
-          enabled: false
-    l3_agent:
-      l3_agent:
-        readiness:
-          enabled: false
-        liveness:
-          enabled: false
-    metadata_agent:
-      metadata_agent:
-        readiness:
-          enabled: false
-        liveness:
-          enabled: false
-    ovs_agent:
-      ovs_agent:
-        liveness:
-          enabled: false
-    sriov_agent:
-      sriov_agent:
-        readiness:
-          enabled: false
diff --git a/nova/values.yaml b/nova/values.yaml
index b56ce74184..ea62d9bac6 100644
--- a/nova/values.yaml
+++ b/nova/values.yaml
@@ -61,32 +61,32 @@ labels:
 images:
   pull_policy: IfNotPresent
   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
+    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
     dep_check: 'quay.io/airshipit/kubernetes-entrypoint:v1.0.0'
     rabbit_init: docker.io/rabbitmq:3.7-management
-    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
+    ks_user: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    ks_service: docker.io/openstackhelm/heat: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
     nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:ocata'
-    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_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_novncproxy_assets: 'docker.io/kolla/ubuntu-source-nova-novncproxy:ocata'
-    nova_placement: docker.io/openstackhelm/nova:ocata-ubuntu_xenial
-    nova_scheduler: docker.io/openstackhelm/nova:ocata-ubuntu_xenial
+    nova_placement: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+    nova_scheduler: docker.io/openstackhelm/nova:stein-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:ocata-ubuntu_xenial
-    nova_spiceproxy_assets: 'docker.io/kolla/ubuntu-source-nova-spicehtml5proxy:ocata'
+    nova_spiceproxy: docker.io/openstackhelm/nova:stein-ubuntu_bionic
+    nova_spiceproxy_assets: docker.io/openstackhelm/nova:stein-ubuntu_bionic
     test: docker.io/xrally/xrally-openstack:1.3.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
new file mode 100644
index 0000000000..5e6daf5d71
--- /dev/null
+++ b/nova/values_overrides/ocata-ubuntu_xenial.yaml
@@ -0,0 +1,24 @@
+---
+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/stein-ubuntu_bionic.yaml b/nova/values_overrides/stein-ubuntu_bionic.yaml
deleted file mode 100644
index 5b14cb06b7..0000000000
--- a/nova/values_overrides/stein-ubuntu_bionic.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-images:
-  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"
-    ks_user: "docker.io/openstackhelm/heat:stein-ubuntu_bionic"
-    ks_service: "docker.io/openstackhelm/heat: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"
-    # nova_compute_ironic: 'docker.io/kolla/ubuntu-source-nova-compute-ironic:rocky'
-    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_novncproxy_assets: "docker.io/openstackhelm/nova:stein-ubuntu_bionic"
-    nova_placement: "docker.io/openstackhelm/nova:stein-ubuntu_bionic"
-    nova_scheduler: "docker.io/openstackhelm/nova:stein-ubuntu_bionic"
-    #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_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_xenial"
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index c52ae9e97f..1c433fb74b 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -43,7 +43,7 @@
     timeout: 7200
     vars:
       zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      osh_openstack_release: ocata
+      osh_openstack_release: stein
     pre-run:
       - tools/gate/playbooks/osh-infra-upgrade-host.yaml
       - tools/gate/playbooks/osh-infra-setup-firewall.yaml
@@ -58,9 +58,9 @@
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: newton
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
         feature_gates: ldap
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
@@ -79,9 +79,9 @@
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: newton
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
@@ -135,23 +135,22 @@
         container_distro_name: opensuse
         container_distro_version: '15'
 - job:
-    name: openstack-helm-cinder-stein-ubuntu_bionic
+    name: openstack-helm-cinder-ocata-ubuntu_xenial
     parent: openstack-helm-cinder
     vars:
       osh_params:
-        openstack_release: stein
+        openstack_release: ocata
         container_distro_name: ubuntu
-        container_distro_version: bionic
-
+        container_distro_version: xenial
 - job:
     name: openstack-helm-compute-kit
     parent: openstack-helm-chart-deploy
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: newton
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
@@ -210,23 +209,22 @@
         container_distro_name: opensuse
         container_distro_version: '15'
 - job:
-    name: openstack-helm-compute-kit-stein-ubuntu_bionic
+    name: openstack-helm-compute-kit-ocata-ubuntu_xenial
     parent: openstack-helm-compute-kit
     vars:
       osh_params:
-        openstack_release: stein
+        openstack_release: ocata
         container_distro_name: ubuntu
-        container_distro_version: bionic
-
+        container_distro_version: xenial
 - job:
     name: openstack-helm-horizon
     parent: openstack-helm-chart-deploy
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: newton
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
@@ -244,9 +242,9 @@
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: newton
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
         - ./tools/deployment/common/deploy-k8s.sh
@@ -273,9 +271,9 @@
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: ocata
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
         feature_gates: netpol
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
@@ -306,9 +304,9 @@
     run: tools/gate/playbooks/osh-gate-runner.yaml
     vars:
       osh_params:
-        openstack_release: ocata
+        openstack_release: stein
         container_distro_name: ubuntu
-        container_distro_version: xenial
+        container_distro_version: bionic
         feature_gates: netpol
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
@@ -333,7 +331,7 @@
     roles:
       - zuul: openstack/openstack-helm-infra
     vars:
-      osh_openstack_release: newton
+      osh_openstack_release: stein
       zuul_osh_infra_relative_path: ../openstack-helm-infra/
     timeout: 7200
     pre-run:
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 1f03f8ee9b..845ac02b59 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,20 +26,21 @@
         - openstack-helm-lint
         - openstack-helm-bandit
         - openstack-helm-cinder
+        - openstack-helm-cinder-ocata-ubuntu_xenial
         - openstack-helm-cinder-pike-ubuntu_xenial
         - openstack-helm-cinder-queens-ubuntu_xenial
         - openstack-helm-cinder-rocky-ubuntu_xenial
         - openstack-helm-cinder-rocky-ubuntu_bionic
-        - openstack-helm-cinder-rocky-opensuse_15
-        - openstack-helm-cinder-stein-ubuntu_bionic
+        - openstack-helm-cinder-rocky-opensuse_15:
+            voting: false
         - openstack-helm-compute-kit
+        - openstack-helm-compute-kit-ocata-ubuntu_xenial
         - openstack-helm-compute-kit-pike-ubuntu_xenial
         - openstack-helm-compute-kit-queens-ubuntu_xenial
         - openstack-helm-compute-kit-rocky-ubuntu_xenial
         - openstack-helm-compute-kit-rocky-ubuntu_bionic
         - openstack-helm-compute-kit-rocky-opensuse_15:
             voting: false
-        - openstack-helm-compute-kit-stein-ubuntu_bionic
         - openstack-helm-horizon
         - openstack-helm-apparmor:
             voting: false