diff --git a/barbican/Chart.yaml b/barbican/Chart.yaml
index 8eb2e340c8..556bf9b592 100644
--- a/barbican/Chart.yaml
+++ b/barbican/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Barbican
 name: barbican
-version: 0.2.13
+version: 0.2.14
 home: https://docs.openstack.org/barbican/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Barbican/OpenStack_Project_Barbican_vertical.png
 sources:
diff --git a/barbican/values_overrides/xena-ubuntu_focal.yaml b/barbican/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..8738d24264
--- /dev/null
+++ b/barbican/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,13 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    scripted_test: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    barbican_db_sync: "docker.io/openstackhelm/barbican:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    barbican_api: "docker.io/openstackhelm/barbican:xena-ubuntu_focal"
+...
diff --git a/barbican/values_overrides/yoga-ubuntu_focal.yaml b/barbican/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..2309a1d673
--- /dev/null
+++ b/barbican/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,13 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    scripted_test: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    barbican_db_sync: "docker.io/openstackhelm/barbican:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    barbican_api: "docker.io/openstackhelm/barbican:yoga-ubuntu_focal"
+...
diff --git a/cinder/Chart.yaml b/cinder/Chart.yaml
index 2823407335..da3cda8dce 100644
--- a/cinder/Chart.yaml
+++ b/cinder/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Cinder
 name: cinder
-version: 0.2.21
+version: 0.2.22
 home: https://docs.openstack.org/cinder/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Cinder/OpenStack_Project_Cinder_vertical.png
 sources:
diff --git a/cinder/values_overrides/xena-ubuntu_focal.yaml b/cinder/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..a05ce819fc
--- /dev/null
+++ b/cinder/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,18 @@
+---
+images:
+  tags:
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    cinder_db_sync: "docker.io/openstackhelm/cinder:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    cinder_api: "docker.io/openstackhelm/cinder:xena-ubuntu_focal"
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    cinder_scheduler: "docker.io/openstackhelm/cinder:xena-ubuntu_focal"
+    cinder_volume: "docker.io/openstackhelm/cinder:xena-ubuntu_focal"
+    cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:xena-ubuntu_focal"
+    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+    cinder_backup: "docker.io/openstackhelm/cinder:xena-ubuntu_focal"
+    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+...
diff --git a/cinder/values_overrides/yoga-ubuntu_focal.yaml b/cinder/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..b15a02e00b
--- /dev/null
+++ b/cinder/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,18 @@
+---
+images:
+  tags:
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    cinder_db_sync: "docker.io/openstackhelm/cinder:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    cinder_api: "docker.io/openstackhelm/cinder:yoga-ubuntu_focal"
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    cinder_scheduler: "docker.io/openstackhelm/cinder:yoga-ubuntu_focal"
+    cinder_volume: "docker.io/openstackhelm/cinder:yoga-ubuntu_focal"
+    cinder_volume_usage_audit: "docker.io/openstackhelm/cinder:yoga-ubuntu_focal"
+    cinder_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+    cinder_backup: "docker.io/openstackhelm/cinder:yoga-ubuntu_focal"
+    cinder_backup_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+...
diff --git a/glance/Chart.yaml b/glance/Chart.yaml
index a308385c8b..abc6623747 100644
--- a/glance/Chart.yaml
+++ b/glance/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Glance
 name: glance
-version: 0.3.5
+version: 0.3.6
 home: https://docs.openstack.org/glance/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Glance/OpenStack_Project_Glance_vertical.png
 sources:
diff --git a/glance/values_overrides/xena-ubuntu_focal.yaml b/glance/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..551219e830
--- /dev/null
+++ b/glance/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,14 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    glance_db_sync: "docker.io/openstackhelm/glance:xena-ubuntu_focal"
+    glance_api: "docker.io/openstackhelm/glance:xena-ubuntu_focal"
+    glance_metadefs_load: "docker.io/openstackhelm/glance:xena-ubuntu_focal"
+    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+...
diff --git a/glance/values_overrides/yoga-ubuntu_focal.yaml b/glance/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..6bab835a8c
--- /dev/null
+++ b/glance/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,14 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    glance_db_sync: "docker.io/openstackhelm/glance:yoga-ubuntu_focal"
+    glance_api: "docker.io/openstackhelm/glance:yoga-ubuntu_focal"
+    glance_metadefs_load: "docker.io/openstackhelm/glance:yoga-ubuntu_focal"
+    glance_storage_init: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+...
diff --git a/heat/Chart.yaml b/heat/Chart.yaml
index 51b912d1ef..46663840a2 100644
--- a/heat/Chart.yaml
+++ b/heat/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Heat
 name: heat
-version: 0.2.12
+version: 0.2.13
 home: https://docs.openstack.org/heat/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Heat/OpenStack_Project_Heat_vertical.png
 sources:
diff --git a/heat/values_overrides/xena-ubuntu_focal.yaml b/heat/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..bfdb0c0b6c
--- /dev/null
+++ b/heat/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,17 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_db_sync: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_api: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_cfn: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_cloudwatch: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_engine: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_engine_cleaner: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    heat_purge_deleted: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+...
diff --git a/heat/values_overrides/yoga-ubuntu_focal.yaml b/heat/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..5f21ac3315
--- /dev/null
+++ b/heat/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,17 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_db_sync: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_api: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_cfn: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_cloudwatch: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_engine: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_engine_cleaner: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    heat_purge_deleted: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+...
diff --git a/horizon/Chart.yaml b/horizon/Chart.yaml
index d17413a0c2..c23d3cb5b2 100644
--- a/horizon/Chart.yaml
+++ b/horizon/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Horizon
 name: horizon
-version: 0.2.22
+version: 0.2.23
 home: https://docs.openstack.org/horizon/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Horizon/OpenStack_Project_Horizon_vertical.png
 sources:
diff --git a/horizon/values_overrides/xena-ubuntu_focal.yaml b/horizon/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..750bcf6cd0
--- /dev/null
+++ b/horizon/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,8 @@
+---
+images:
+  tags:
+    db_init: docker.io/openstackhelm/heat:xena-ubuntu_focal
+    db_drop: docker.io/openstackhelm/heat:xena-ubuntu_focal
+    horizon_db_sync: docker.io/openstackhelm/horizon:xena-ubuntu_focal
+    horizon: docker.io/openstackhelm/horizon:xena-ubuntu_focal
+...
diff --git a/horizon/values_overrides/yoga-ubuntu_focal.yaml b/horizon/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..49fb9a6b0b
--- /dev/null
+++ b/horizon/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,8 @@
+---
+images:
+  tags:
+    db_init: docker.io/openstackhelm/heat:yoga-ubuntu_focal
+    db_drop: docker.io/openstackhelm/heat:yoga-ubuntu_focal
+    horizon_db_sync: docker.io/openstackhelm/horizon:yoga-ubuntu_focal
+    horizon: docker.io/openstackhelm/horizon:yoga-ubuntu_focal
+...
diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index 2c4de9fc5e..3c0acc6b11 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Keystone
 name: keystone
-version: 0.2.25
+version: 0.2.26
 home: https://docs.openstack.org/keystone/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
 sources:
diff --git a/keystone/values_overrides/xena-ubuntu_focal.yaml b/keystone/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..51ead44b12
--- /dev/null
+++ b/keystone/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,16 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    keystone_api: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    keystone_bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    keystone_credential_rotate: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    keystone_credential_setup: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    keystone_db_sync: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    keystone_domain_manage: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    keystone_fernet_rotate: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    keystone_fernet_setup: "docker.io/openstackhelm/keystone:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+...
diff --git a/keystone/values_overrides/yoga-ubuntu_focal.yaml b/keystone/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..6b216fa4fc
--- /dev/null
+++ b/keystone/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,16 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    keystone_api: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    keystone_bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    keystone_credential_rotate: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    keystone_credential_setup: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    keystone_db_sync: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    keystone_domain_manage: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    keystone_fernet_rotate: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    keystone_fernet_setup: "docker.io/openstackhelm/keystone:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+...
diff --git a/neutron/Chart.yaml b/neutron/Chart.yaml
index d7025df741..37c277547a 100644
--- a/neutron/Chart.yaml
+++ b/neutron/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Neutron
 name: neutron
-version: 0.2.19
+version: 0.2.20
 home: https://docs.openstack.org/neutron/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Neutron/OpenStack_Project_Neutron_vertical.png
 sources:
diff --git a/neutron/values_overrides/xena-ubuntu_focal.yaml b/neutron/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..4fda916fd3
--- /dev/null
+++ b/neutron/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,20 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    neutron_db_sync: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_dhcp: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_l3: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_l2gw: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_metadata: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_server: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_rpc_server: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+    neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:xena-ubuntu_focal"
+...
diff --git a/neutron/values_overrides/yoga-ubuntu_focal.yaml b/neutron/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..f47136bc3e
--- /dev/null
+++ b/neutron/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,20 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    neutron_db_sync: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_dhcp: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_l3: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_l2gw: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_linuxbridge_agent: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_metadata: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_openvswitch_agent: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_server: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_rpc_server: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+    neutron_bagpipe_bgp: "docker.io/openstackhelm/neutron:yoga-ubuntu_focal"
+...
diff --git a/nova/Chart.yaml b/nova/Chart.yaml
index f171e83c56..7a119346f8 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.40
+version: 0.2.41
 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_overrides/xena-ubuntu_focal.yaml b/nova/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..c73e258fc3
--- /dev/null
+++ b/nova/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,23 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    nova_api: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_cell_setup: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_cell_setup_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    nova_compute: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_compute_ssh: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_conductor: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_db_sync: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_novncproxy: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_novncproxy_assets: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_scheduler: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_spiceproxy: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:xena-ubuntu_focal"
+    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+...
diff --git a/nova/values_overrides/xena.yaml b/nova/values_overrides/xena.yaml
new file mode 100644
index 0000000000..0bffb7e3a8
--- /dev/null
+++ b/nova/values_overrides/xena.yaml
@@ -0,0 +1,6 @@
+---
+conf:
+  rally_tests:
+    tests:
+      NovaAgents.list_agents: []
+...
diff --git a/nova/values_overrides/yoga-ubuntu_focal.yaml b/nova/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..d3c994dda6
--- /dev/null
+++ b/nova/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,23 @@
+---
+images:
+  tags:
+    bootstrap: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    nova_api: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_cell_setup: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_cell_setup_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    nova_compute: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_compute_ssh: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_conductor: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_db_sync: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_novncproxy: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_novncproxy_assets: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_scheduler: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_spiceproxy: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_spiceproxy_assets: "docker.io/openstackhelm/nova:yoga-ubuntu_focal"
+    nova_service_cleaner: "docker.io/openstackhelm/ceph-config-helper:latest-ubuntu_bionic"
+...
diff --git a/nova/values_overrides/yoga.yaml b/nova/values_overrides/yoga.yaml
new file mode 100644
index 0000000000..0bffb7e3a8
--- /dev/null
+++ b/nova/values_overrides/yoga.yaml
@@ -0,0 +1,6 @@
+---
+conf:
+  rally_tests:
+    tests:
+      NovaAgents.list_agents: []
+...
diff --git a/placement/Chart.yaml b/placement/Chart.yaml
index 71de69d123..123caf885d 100644
--- a/placement/Chart.yaml
+++ b/placement/Chart.yaml
@@ -16,7 +16,7 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Placement
 name: placement
-version: 0.2.8
+version: 0.2.9
 home: https://docs.openstack.org/placement/latest/
 icon: https://www.openstack.org/themes/openstack/images/project-mascots/Placement/OpenStack_Project_Placement_vertical.png
 sources:
diff --git a/placement/values_overrides/xena-ubuntu_focal.yaml b/placement/values_overrides/xena-ubuntu_focal.yaml
new file mode 100644
index 0000000000..c8355d9595
--- /dev/null
+++ b/placement/values_overrides/xena-ubuntu_focal.yaml
@@ -0,0 +1,23 @@
+---
+images:
+  pull_policy: IfNotPresent
+  tags:
+    placement: "docker.io/openstackhelm/placement:xena-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:xena-ubuntu_focal"
+    db_migrate: "quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic"
+    placement_db_sync: "docker.io/openstackhelm/placement:xena-ubuntu_focal"
+    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "docker.io/docker:17.07.0"
+manifests:
+  job_db_migrate: true
+dependencies:
+  static:
+    db_sync:
+      jobs:
+        - placement-db-init
+        - placement-db-migrate
+...
diff --git a/placement/values_overrides/yoga-ubuntu_focal.yaml b/placement/values_overrides/yoga-ubuntu_focal.yaml
new file mode 100644
index 0000000000..b508709143
--- /dev/null
+++ b/placement/values_overrides/yoga-ubuntu_focal.yaml
@@ -0,0 +1,23 @@
+---
+images:
+  pull_policy: IfNotPresent
+  tags:
+    placement: "docker.io/openstackhelm/placement:yoga-ubuntu_focal"
+    ks_user: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_service: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    ks_endpoints: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_init: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_drop: "docker.io/openstackhelm/heat:yoga-ubuntu_focal"
+    db_migrate: "quay.io/airshipit/porthole-mysqlclient-utility:latest-ubuntu_bionic"
+    placement_db_sync: "docker.io/openstackhelm/placement:yoga-ubuntu_focal"
+    dep_check: "quay.io/airshipit/kubernetes-entrypoint:v1.0.0"
+    image_repo_sync: "docker.io/docker:17.07.0"
+manifests:
+  job_db_migrate: true
+dependencies:
+  static:
+    db_sync:
+      jobs:
+        - placement-db-init
+        - placement-db-migrate
+...
diff --git a/releasenotes/notes/barbican.yaml b/releasenotes/notes/barbican.yaml
index 04dc06b491..d8a3c73111 100644
--- a/releasenotes/notes/barbican.yaml
+++ b/releasenotes/notes/barbican.yaml
@@ -17,4 +17,5 @@ barbican:
   - 0.2.11 Fix job annotations for db init job
   - 0.2.12 Remove older values overrides
   - 0.2.13 Migrated PodDisruptionBudget resource to policy/v1 API version
+  - 0.2.14 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/cinder.yaml b/releasenotes/notes/cinder.yaml
index da73ff40ef..aecffb03c2 100644
--- a/releasenotes/notes/cinder.yaml
+++ b/releasenotes/notes/cinder.yaml
@@ -38,4 +38,5 @@ cinder:
   - 0.2.19 Add volume types visibility (public/private)
   - 0.2.20 Allow cinder v1/v2 endpoint creation if needed
   - 0.2.21 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
+  - 0.2.22 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/glance.yaml b/releasenotes/notes/glance.yaml
index f2f43c5fce..34a1a7e6e0 100644
--- a/releasenotes/notes/glance.yaml
+++ b/releasenotes/notes/glance.yaml
@@ -26,4 +26,5 @@ glance:
   - 0.3.3 Update naming for subchart compatibility
   - 0.3.4 Change image default version to wallaby
   - 0.3.5 Migrated PodDisruptionBudget resource to policy/v1 API version
+  - 0.3.6 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/heat.yaml b/releasenotes/notes/heat.yaml
index 333c209af2..f2535ef96d 100644
--- a/releasenotes/notes/heat.yaml
+++ b/releasenotes/notes/heat.yaml
@@ -19,4 +19,5 @@ heat:
   - 0.2.10 Updated naming for subchart compatibility
   - 0.2.11 Remove old releases values override in heat
   - 0.2.12 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
+  - 0.2.13 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/horizon.yaml b/releasenotes/notes/horizon.yaml
index d8072f6a75..71337a7a0c 100644
--- a/releasenotes/notes/horizon.yaml
+++ b/releasenotes/notes/horizon.yaml
@@ -32,4 +32,5 @@ horizon:
   - 0.2.20 Add SHOW_OPENRC_FILE value
   - 0.2.21 Add helm hook annotations in db-sync and db-init jobs
   - 0.2.22 Migrated PodDisruptionBudget resource to policy/v1 API version
+  - 0.2.23 Add Xena and Yoga value overrides
 ...
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index 3cfb444776..81456c2ae7 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -41,4 +41,5 @@ keystone:
   - 0.2.23 Remove usage of six
   - 0.2.24 Remove unused admin port in keystone
   - 0.2.25 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
+  - 0.2.26 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/neutron.yaml b/releasenotes/notes/neutron.yaml
index 86cef8b072..d373776103 100644
--- a/releasenotes/notes/neutron.yaml
+++ b/releasenotes/notes/neutron.yaml
@@ -33,4 +33,5 @@ neutron:
   - 0.2.17 Migrated PodDisruptionBudget resource to policy/v1 API version
   - 0.2.18 Updated naming for subchart compatibility
   - 0.2.19 Added qdhcp NS host validation for deleting wrong namespaces.
+  - 0.2.20 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/nova.yaml b/releasenotes/notes/nova.yaml
index 15d3910afc..c9c9500d17 100644
--- a/releasenotes/notes/nova.yaml
+++ b/releasenotes/notes/nova.yaml
@@ -61,4 +61,5 @@ nova:
   - 0.2.38 Update nova image defaults
   - 0.2.39 Migrated CronJob resource to batch/v1 API version & PodDisruptionBudget to policy/v1
   - 0.2.40 Updated naming for subchart compatibility
+  - 0.2.41 Add Xena and Yoga values overrides
 ...
diff --git a/releasenotes/notes/placement.yaml b/releasenotes/notes/placement.yaml
index f0c0737133..500bceb399 100644
--- a/releasenotes/notes/placement.yaml
+++ b/releasenotes/notes/placement.yaml
@@ -17,4 +17,5 @@ placement:
   - 0.2.6 Enable taint toleration for Openstack services
   - 0.2.7 Add helm hook annotations for db-sync job
   - 0.2.8 Migrated PodDisruptionBudget resource to policy/v1 API version
+  - 0.2.9 Add Xena and Yoga values overrides
 ...