diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 5e51e3f4cf..8c961db8c1 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -37,7 +37,6 @@
     timeout: 7200
     vars:
       zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      osh_openstack_release: train
       gate_scripts: []
     pre-run:
       - tools/gate/playbooks/osh-infra-upgrade-host.yaml
@@ -56,9 +55,9 @@
       - ^zuul\.d/.*$
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: wallaby
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: ldap
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
@@ -81,10 +80,6 @@
       - ^zuul\.d/.*$
       - ^tools/deployment/component/cinder/.
     vars:
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
         - ./tools/deployment/common/install-packages.sh
@@ -140,10 +135,6 @@
     name: openstack-helm-compute-kit
     parent: openstack-helm-chart-deploy
     vars:
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
       run_helm_tests: "no"
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
@@ -272,9 +263,9 @@
     nodeset: openstack-helm-single-32GB-node
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: wallaby
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: tls
       run_helm_tests: "no"
       gate_scripts_relative_path: ../openstack-helm
@@ -311,9 +302,9 @@
     timeout: 9600
     vars:
       osh_params:
-        openstack_release: train
+        openstack_release: wallaby
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: apparmor
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
@@ -435,9 +426,9 @@
     timeout: 7200
     vars:
       osh_params:
-        openstack_release: ussuri
+        openstack_release: wallaby
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: netpol
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts:
@@ -467,9 +458,9 @@
     timeout: 7200
     vars:
       osh_params:
-        openstack_release: ussuri
+        openstack_release: wallaby
         container_distro_name: ubuntu
-        container_distro_version: bionic
+        container_distro_version: focal
         feature_gates: netpol
       gate_scripts_relative_path: ../openstack-helm
       gate_scripts: