diff --git a/tox.ini b/tox.ini
index 032d6b7..fe7130f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,9 +16,9 @@
 
 [testenv:pep8]
 deps =
-    hacking>=3.1.0,<4.0.0 # Apache-2.0
+    hacking>=4.1.0,<5.0.0 # Apache-2.0
     flake8-import-order>=0.17.1 # LGPLv3
-    pycodestyle>=2.0.0,<2.7.0 # MIT
+    pycodestyle>=2.0.0,<3.0.0 # MIT
 commands = flake8 {posargs}
 
 [testenv:venv]
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 57bfcea..6198ffd 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -7,56 +7,55 @@
       jobs:
         # NOTE(dtantsur): keep N-3 and older non-voting for these jobs.
         - ironic-standalone
+        - ironic-standalone-xena
         - ironic-standalone-wallaby
-        - ironic-standalone-victoria
-        - ironic-standalone-ussuri:
+        - ironic-standalone-victoria:
             voting: false
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-xena
         - ironic-tempest-functional-python3-wallaby
-        - ironic-tempest-functional-python3-victoria
-        - ironic-tempest-functional-python3-ussuri:
+        - ironic-tempest-functional-python3-victoria:
             voting: false
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-xena
         - ironic-inspector-tempest-wallaby
-        - ironic-inspector-tempest-victoria
-        - ironic-inspector-tempest-ussuri:
+        - ironic-inspector-tempest-victoria:
             voting: false
         - ironic-standalone-redfish
+        - ironic-standalone-redfish-xena:
+            voting: false
         - ironic-standalone-redfish-wallaby:
             voting: false
         - ironic-standalone-redfish-victoria:
             voting: false
-        - ironic-standalone-redfish-ussuri:
-            voting: false
         # NOTE(dtantsur): these jobs cover rarely changed tests and are quite
         # unstable, so keep them non-voting.
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode:
             voting: false
+        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena:
+            voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby:
             voting: false
         - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-victoria:
             voting: false
-        - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-ussuri:
-            voting: false
         - ironic-inspector-tempest-discovery
+        - ironic-inspector-tempest-discovery-xena:
+            voting: false
         - ironic-inspector-tempest-discovery-wallaby:
             voting: false
         - ironic-inspector-tempest-discovery-victoria:
             voting: false
-        - ironic-inspector-tempest-discovery-ussuri:
-            voting: false
     gate:
       queue: ironic
       jobs:
         - ironic-standalone
+        - ironic-standalone-xena
         - ironic-standalone-wallaby
-        - ironic-standalone-victoria
         - ironic-tempest-functional-python3
+        - ironic-tempest-functional-python3-xena
         - ironic-tempest-functional-python3-wallaby
-        - ironic-tempest-functional-python3-victoria
         - ironic-inspector-tempest
+        - ironic-inspector-tempest-xena
         - ironic-inspector-tempest-wallaby
-        - ironic-inspector-tempest-victoria
-        - ironic-inspector-tempest-ussuri
         - ironic-standalone-redfish
         - ironic-inspector-tempest-discovery
diff --git a/zuul.d/stable-jobs.yaml b/zuul.d/stable-jobs.yaml
index 6e96c34..0f83c2a 100644
--- a/zuul.d/stable-jobs.yaml
+++ b/zuul.d/stable-jobs.yaml
@@ -1,4 +1,9 @@
 - job:
+    name: ironic-standalone-xena
+    parent: ironic-standalone
+    override-checkout: stable/xena
+
+- job:
     name: ironic-standalone-wallaby
     parent: ironic-standalone
     override-checkout: stable/wallaby
@@ -22,6 +27,12 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-standalone-redfish-xena
+    parent: ironic-standalone-redfish
+    nodeset: openstack-single-node-focal
+    override-checkout: stable/xena
+
+- job:
     name: ironic-standalone-redfish-wallaby
     parent: ironic-standalone-redfish
     nodeset: openstack-single-node-focal
@@ -47,6 +58,11 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-tempest-functional-python3-xena
+    parent: ironic-tempest-functional-python3
+    override-checkout: stable/xena
+
+- job:
     name: ironic-tempest-functional-python3-wallaby
     parent: ironic-tempest-functional-python3
     override-checkout: stable/wallaby
@@ -67,6 +83,11 @@
     override-checkout: stable/train
 
 - job:
+    name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-xena
+    parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
+    override-checkout: stable/xena
+
+- job:
     name: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode-wallaby
     parent: ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode
     override-checkout: stable/wallaby
@@ -90,6 +111,11 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-inspector-tempest-xena
+    parent: ironic-inspector-tempest
+    override-checkout: stable/xena
+
+- job:
     name: ironic-inspector-tempest-wallaby
     parent: ironic-inspector-tempest
     override-checkout: stable/wallaby
@@ -122,6 +148,11 @@
         USE_PYTHON3: True
 
 - job:
+    name: ironic-inspector-tempest-discovery-xena
+    parent: ironic-inspector-tempest-discovery
+    override-checkout: stable/xena
+
+- job:
     name: ironic-inspector-tempest-discovery-wallaby
     parent: ironic-inspector-tempest-discovery
     override-checkout: stable/wallaby