diff --git a/cinder/values_overrides/stein-ubuntu_bionic.yaml b/cinder/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..6a9402894d
--- /dev/null
+++ b/cinder/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,17 @@
+---
+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/glance/values_overrides/stein-ubuntu_bionic.yaml b/glance/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..b4db0c286a
--- /dev/null
+++ b/glance/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,13 @@
+---
+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_overrides/stein-ubuntu_bionic.yaml b/heat/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..0450d7e1c9
--- /dev/null
+++ b/heat/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,16 @@
+---
+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_overrides/stein-ubuntu_bionic.yaml b/horizon/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..4f86c1021c
--- /dev/null
+++ b/horizon/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,7 @@
+---
+images:
+  tags:
+    db_init: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    db_drop: docker.io/openstackhelm/heat:stein-ubuntu_bionic
+    horizon_db_sync: docker.io/openstackhelm/horizon:stein-ubuntu_bionic
+    horizon: docker.io/openstackhelm/horizon:stein-ubuntu_bionic
diff --git a/keystone/values_overrides/stein-ubuntu_bionic.yaml b/keystone/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..e0e1a77587
--- /dev/null
+++ b/keystone/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,15 @@
+---
+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_overrides/stein-ubuntu_bionic.yaml b/neutron/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..6143b2b50d
--- /dev/null
+++ b/neutron/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,16 @@
+---
+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
new file mode 100644
index 0000000000..6b780bdb12
--- /dev/null
+++ b/neutron/values_overrides/stein.yaml
@@ -0,0 +1,38 @@
+# 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_overrides/stein-ubuntu_bionic.yaml b/nova/values_overrides/stein-ubuntu_bionic.yaml
new file mode 100644
index 0000000000..9d4790aa03
--- /dev/null
+++ b/nova/values_overrides/stein-ubuntu_bionic.yaml
@@ -0,0 +1,26 @@
+---
+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/port/ceph-config-helper:v1.10.3'
+    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/tools/deployment/component/compute-kit/libvirt.sh b/tools/deployment/component/compute-kit/libvirt.sh
index 0627206a95..0d79f0c17c 100755
--- a/tools/deployment/component/compute-kit/libvirt.sh
+++ b/tools/deployment/component/compute-kit/libvirt.sh
@@ -17,7 +17,7 @@ set -xe
 
 #NOTE: Get the over-rides to use
 export HELM_CHART_ROOT_PATH="${HELM_CHART_ROOT_PATH:="${OSH_INFRA_PATH:="../openstack-helm-infra"}"}"
-: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh rabbitmq)"}
+: ${OSH_EXTRA_HELM_ARGS_LIBVIRT:="$(./tools/deployment/common/get-values-overrides.sh libvirt)"}
 
 #NOTE: Lint and package chart
 make -C ${HELM_CHART_ROOT_PATH} libvirt
diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 483fcd0364..40b11d4a6a 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -110,6 +110,14 @@
         openstack_release: rocky
         container_distro_name: opensuse
         container_distro_version: '15'
+- job:
+    name: openstack-helm-keystone-stein-ubuntu_bionic
+    parent: openstack-helm-keystone
+    vars:
+      osh_params:
+        openstack_release: stein
+        container_distro_name: ubuntu
+        container_distro_version: bionic
 
 - job:
     name: openstack-helm-keystone-ldap
@@ -192,6 +200,14 @@
         openstack_release: rocky
         container_distro_name: opensuse
         container_distro_version: '15'
+- job:
+    name: openstack-helm-glance-stein-ubuntu_bionic
+    parent: openstack-helm-glance
+    vars:
+      osh_params:
+        openstack_release: stein
+        container_distro_name: ubuntu
+        container_distro_version: bionic
 
 - job:
     name: openstack-helm-heat
@@ -252,6 +268,14 @@
         openstack_release: rocky
         container_distro_name: opensuse
         container_distro_version: '15'
+- job:
+    name: openstack-helm-heat-stein-ubuntu_bionic
+    parent: openstack-helm-heat
+    vars:
+      osh_params:
+        openstack_release: stein
+        container_distro_name: ubuntu
+        container_distro_version: bionic
 
 - job:
     name: openstack-helm-cinder
@@ -314,6 +338,14 @@
         openstack_release: rocky
         container_distro_name: opensuse
         container_distro_version: '15'
+- job:
+    name: openstack-helm-cinder-stein-ubuntu_bionic
+    parent: openstack-helm-cinder
+    vars:
+      osh_params:
+        openstack_release: stein
+        container_distro_name: ubuntu
+        container_distro_version: bionic
 
 - job:
     name: openstack-helm-compute-kit
@@ -381,6 +413,14 @@
         openstack_release: rocky
         container_distro_name: opensuse
         container_distro_version: '15'
+- job:
+    name: openstack-helm-compute-kit-stein-ubuntu_bionic
+    parent: openstack-helm-compute-kit
+    vars:
+      osh_params:
+        openstack_release: stein
+        container_distro_name: ubuntu
+        container_distro_version: bionic
 
 - job:
     name: openstack-helm-horizon
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index dfd63aee63..5019b2ba8d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -36,6 +36,8 @@
             voting: false
         - openstack-helm-cinder-rocky-opensuse_15:
             voting: false
+        - openstack-helm-cinder-stein-ubuntu_bionic:
+            voting: false
         - openstack-helm-compute-kit
         - openstack-helm-compute-kit-pike-ubuntu_xenial:
             voting: false
@@ -47,6 +49,8 @@
             voting: false
         - openstack-helm-compute-kit-rocky-opensuse_15:
             voting: false
+        - openstack-helm-compute-kit-stein-ubuntu_bionic:
+            voting: false
         - openstack-helm-horizon
         - openstack-helm-apparmor:
             voting: false
@@ -64,6 +68,7 @@
         - openstack-helm-keystone-rocky-ubuntu_xenial
         - openstack-helm-keystone-rocky-ubuntu_bionic
         - openstack-helm-keystone-rocky-opensuse_15
+        - openstack-helm-keystone-stein-ubuntu_bionic
         # Keystone job that exersizes feature gate
         - openstack-helm-keystone-ldap
         # Glance jobs that are replicated in compute-kit
@@ -73,6 +78,7 @@
         - openstack-helm-glance-rocky-ubuntu_xenial
         - openstack-helm-glance-rocky-ubuntu_bionic
         - openstack-helm-glance-rocky-opensuse_15
+        - openstack-helm-glance-stein-ubuntu_bionic
         # Heat jobs that are replicated in compute-kit
         - openstack-helm-heat
         - openstack-helm-heat-pike-ubuntu_xenial
@@ -80,6 +86,7 @@
         - openstack-helm-heat-rocky-ubuntu_xenial
         - openstack-helm-heat-rocky-ubuntu_bionic
         - openstack-helm-heat-rocky-opensuse_15
+        - openstack-helm-heat-stein-ubuntu_bionic
         # Unique periodic jobs
         - openstack-helm-multinode-temp-ubuntu
         - openstack-helm-ironic-ubuntu