diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 34d0e02ed..e925b6676 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -65,9 +65,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
         - ./tools/deployment/common/000-install-packages.sh
@@ -84,9 +84,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
         - ./tools/deployment/common/000-install-packages.sh
@@ -297,7 +297,7 @@
     vars:
       osh_params:
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: apparmor
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -332,7 +332,7 @@
     vars:
       osh_params:
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: apparmor
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -361,9 +361,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: apparmor
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -393,7 +393,7 @@
     vars:
       osh_params:
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: apparmor
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -414,9 +414,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
         - ./tools/deployment/openstack-support/000-install-packages.sh
@@ -490,9 +490,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: local-storage
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -530,9 +530,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: ssl
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts:
@@ -567,9 +567,9 @@
     nodeset: openstack-helm-single-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: xena
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: "ssl,apparmor"
       gate_scripts_relative_path: ../openstack-helm-infra
       gate_scripts: