diff --git a/zuul.d/jobs-openstack-helm.yaml b/zuul.d/jobs-openstack-helm.yaml
index 9452f4f4bb..0d3064e977 100644
--- a/zuul.d/jobs-openstack-helm.yaml
+++ b/zuul.d/jobs-openstack-helm.yaml
@@ -93,15 +93,6 @@
         - ./tools/deployment/component/cinder/cinder.sh
         - ./tools/deployment/common/force-cronjob-run.sh
 
-- job:
-    name: openstack-helm-cinder-train-ubuntu_bionic
-    parent: openstack-helm-cinder
-    vars:
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-
 - job:
     name: openstack-helm-cinder-ussuri-ubuntu_bionic
     parent: openstack-helm-cinder
@@ -182,15 +173,6 @@
         - - ./tools/deployment/developer/common/900-use-it.sh
           - ./tools/deployment/common/force-cronjob-run.sh
 
-- job:
-    name: openstack-helm-compute-kit-train-ubuntu_bionic
-    parent: openstack-helm-compute-kit
-    vars:
-      osh_params:
-        openstack_release: train
-        container_distro_name: ubuntu
-        container_distro_version: bionic
-
 - job:
     name: openstack-helm-compute-kit-ussuri-ubuntu_bionic
     parent: openstack-helm-compute-kit
@@ -236,30 +218,6 @@
         container_distro_name: ubuntu
         container_distro_version: focal
 
-- job:
-    name: openstack-helm-horizon-train-ubuntu_bionic
-    parent: openstack-helm-chart-deploy
-    files:
-      - ^horizon/.*$
-      - ^zuul\.d/.*$
-      - ^tools/deployment/component/horizon/.*$
-    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
-        - ./tools/gate/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - ./tools/deployment/component/common/mariadb.sh
-        - ./tools/deployment/component/common/memcached.sh
-        - ./tools/deployment/component/common/rabbitmq.sh
-        - ./tools/deployment/component/keystone/keystone.sh
-        - ./tools/deployment/component/horizon/horizon.sh
-
 - job:
     name: openstack-helm-horizon-wallaby-ubuntu_focal
     parent: openstack-helm-chart-deploy
@@ -397,9 +355,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:
@@ -415,41 +373,6 @@
         - ./tools/deployment/component/keystone/keystone.sh
         - ./tools/deployment/component/cinder/cinder.sh
 
-- job:
-    name: openstack-helm-tungsten-fabric-train
-    parent: openstack-helm-compute-kit
-    timeout: 9600
-    nodeset: openstack-helm-single-16GB-node
-    roles:
-      - zuul: openstack/openstack-helm-infra
-    required-projects:
-      - openstack/openstack-helm-infra
-    vars:
-      zuul_osh_infra_relative_path: ../openstack-helm-infra/
-      osh_params:
-        feature_gates: tf
-        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
-        - ./tools/deployment/common/deploy-k8s.sh
-        - ./tools/deployment/common/setup-client.sh
-        - ./tools/deployment/component/common/ingress.sh
-        - - ./tools/deployment/component/common/mariadb.sh
-          - ./tools/deployment/component/common/memcached.sh
-          - ./tools/deployment/component/common/rabbitmq.sh
-        - - ./tools/deployment/component/compute-kit/tungsten-fabric.sh checkdns
-          - ./tools/deployment/component/compute-kit/tungsten-fabric.sh setupdns
-          - ./tools/deployment/component/keystone/keystone.sh
-        - - ./tools/deployment/component/heat/heat.sh
-          - ./tools/deployment/component/glance/glance.sh
-          - ./tools/deployment/component/compute-kit/tungsten-fabric.sh prepare
-          - ./tools/deployment/component/compute-kit/libvirt.sh
-        - ./tools/deployment/component/compute-kit/compute-kit.sh
-        - ./tools/deployment/component/compute-kit/tungsten-fabric.sh deploy
-
 - job:
     name: openstack-helm-tungsten-fabric-ussuri
     parent: openstack-helm-compute-kit
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 15bc221d28..3217c29992 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,12 +23,10 @@
       jobs:
         - openstack-helm-lint
         - openstack-helm-bandit
-        - openstack-helm-cinder-train-ubuntu_bionic
         - openstack-helm-cinder-ussuri-ubuntu_bionic
         - openstack-helm-cinder-victoria-ubuntu_focal
         - openstack-helm-cinder-wallaby-ubuntu_focal
         # - openstack-helm-cinder-xena-ubuntu_focal
-        - openstack-helm-compute-kit-train-ubuntu_bionic
         - openstack-helm-compute-kit-ussuri-ubuntu_bionic
         - openstack-helm-compute-kit-victoria-ubuntu_focal
         - openstack-helm-compute-kit-victoria-ubuntu_focal-umbrella
@@ -40,16 +38,13 @@
       jobs:
         - openstack-helm-lint
         - openstack-helm-tls
-        - openstack-helm-cinder-train-ubuntu_bionic
-        - openstack-helm-compute-kit-train-ubuntu_bionic
-        - openstack-helm-multinode-compute-kit-train-ubuntu_bionic
-        - openstack-helm-multinode-cinder-train-ubuntu_bionic
+        - openstack-helm-cinder-wallaby-ubuntu_focal
+        - openstack-helm-compute-kit-wallaby-ubuntu_focal
     post:
       jobs:
         - publish-openstack-helm-charts
     periodic:
       jobs:
-        - openstack-helm-tungsten-fabric-train
         - openstack-helm-tungsten-fabric-ussuri
     experimental:
       jobs: