diff --git a/.zuul.yaml b/.zuul.yaml
index 0e509927..234d4fda 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -306,10 +306,25 @@
 # TripleO jobs
 - job:
     name: tripleo-ci-centos-8-standalone-osa
-    parent: tripleo-ci-centos-8-standalone
+    parent: tripleo-ci-base-standalone-centos-8
     vars:
+      featureset: '052'
       consumer_job: false
       build_container_images: true
+    irrelevant-files: &irr_files
+      - .*molecule.*
+      - ^.*\.md$
+      - ^.*\.rst$
+      - ^docs/.*$
+      - ^contrib/.*$
+      - ^changelogs/.*$
+      - ^meta/.*$
+      - ^tests/.*$
+      - ^tools/.*$
+      - ^requirements.*$
+      - ^test-requirements.*$
+      - ^setup.*$
+      - tox.ini
     # Run only on files used in TripleO
     files: &ooo_files
       - ^plugins/modules/catalog_service.*$
@@ -324,14 +339,39 @@
       - ^plugins/modules/stack.*$
       - ^plugins/module_utils/openstack.*$
 
+- job:
+    name: tripleo-ci-centos-9-standalone-osa
+    parent: tripleo-ci-centos-9-standalone
+    branches: master
+    vars:
+      consumer_job: false
+      build_container_images: true
+    # Run only on files used in TripleO
+    files: *ooo_files
+    irrelevant-files: *irr_files
+
 - job:
     name: tripleo-ci-centos-8-standalone-train-osa
     parent: tripleo-ci-centos-8-standalone-osa
-    voting: false
     override-checkout: stable/train
     vars:
       branch_override: stable/train
 
+- job:
+    name: tripleo-ci-centos-8-standalone-wallaby-osa
+    parent: tripleo-ci-centos-8-standalone-osa
+    override-checkout: stable/wallaby
+    vars:
+      branch_override: stable/wallaby
+
+- job:
+    name: tripleo-ci-centos-9-standalone-wallaby-osa
+    parent: tripleo-ci-centos-9-standalone-osa
+    branches: master
+    override-checkout: stable/wallaby
+    vars:
+      branch_override: stable/wallaby
+
 - job:
     name: ansible-collections-openstack-release
     parent: base
@@ -396,13 +436,22 @@
             dependencies: *deps_unit_lint
             irrelevant-files: *ignore_files
 
-        - tripleo-ci-centos-8-standalone-osa:
+        - tripleo-ci-centos-8-standalone-wallaby-osa:
+            voting: false
             dependencies: *deps_unit_lint
 
         - tripleo-ci-centos-8-standalone-train-osa:
             voting: false
             dependencies: *deps_unit_lint
 
+        - tripleo-ci-centos-9-standalone-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
+        - tripleo-ci-centos-9-standalone-wallaby-osa:
+            voting: false
+            dependencies: *deps_unit_lint
+
     gate:
       jobs:
         - tox-pep8
@@ -416,7 +465,7 @@
         - ansible-collections-openstack-functional-devstack-xena-ansible-2.12
         - ansible-collections-openstack-functional-devstack-train-ansible-2.11
         - ansible-collections-openstack-functional-devstack-octavia
-        - tripleo-ci-centos-8-standalone-osa
+        - tripleo-ci-centos-8-standalone-wallaby-osa
 
     periodic:
       jobs: