diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ffdde1b..1e6759d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -19,7 +19,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.29.0
+    rev: v1.31.0
     hooks:
       - id: yamllint
         files: \.(yaml|yml)$
diff --git a/doc/requirements.txt b/doc/requirements.txt
index ae5795d..f9dde2b 100644
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -5,5 +5,5 @@
 # As openstack job build-reno-releasenotes and Read The Docs page support only
 # one single requirements file for a project, we need to have one such file
 # which will include all project requirements
-sphinx>=3.4.2                 # BSD
+sphinx>=3.4.2,<=4.4.0         # BSD
 sphinx_rtd_theme>=0.5.1,<1    # Apache-2.0
diff --git a/zuul.d/devstack-tobiko-designate.yaml b/zuul.d/devstack-tobiko-designate.yaml
index 8a95820..cce9a23 100644
--- a/zuul.d/devstack-tobiko-designate.yaml
+++ b/zuul.d/devstack-tobiko-designate.yaml
@@ -20,6 +20,7 @@
 - job:
     name: devstack-tobiko-designate
     parent: devstack-tobiko-minimal
+    nodeset: devstack-tobiko-focal
     voting: true
     required-projects: &REQUIRED_PROJECTS
       - opendev.org/openstack/designate
diff --git a/zuul.d/devstack-tobiko-heat.yaml b/zuul.d/devstack-tobiko-heat.yaml
index 0a4b886..aaa4e0b 100644
--- a/zuul.d/devstack-tobiko-heat.yaml
+++ b/zuul.d/devstack-tobiko-heat.yaml
@@ -15,6 +15,7 @@
 - job:
     name: devstack-tobiko-heat
     parent: devstack-tobiko-minimal
+    nodeset: devstack-tobiko-focal
     required-projects:
       - openstack/heat
     voting: true
diff --git a/zuul.d/devstack-tobiko-minimal.yaml b/zuul.d/devstack-tobiko-minimal.yaml
index e835200..df1391b 100644
--- a/zuul.d/devstack-tobiko-minimal.yaml
+++ b/zuul.d/devstack-tobiko-minimal.yaml
@@ -17,7 +17,7 @@
     abstract: false
     name: devstack-tobiko-minimal
     parent: devstack
-    nodeset: devstack-tobiko
+    nodeset: devstack-tobiko-jammy
     voting: true
     description: |
       Minimal Devstack Tobiko Plugin job.
diff --git a/zuul.d/devstack-tobiko.yaml b/zuul.d/devstack-tobiko.yaml
index 89525d9..05843f8 100644
--- a/zuul.d/devstack-tobiko.yaml
+++ b/zuul.d/devstack-tobiko.yaml
@@ -20,7 +20,7 @@
     abstract: false
     name: devstack-tobiko
     parent: devstack-tobiko-minimal
-    nodeset: devstack-tobiko
+    nodeset: devstack-tobiko-focal
     voting: true
     description: |
       Base Devstack Tobiko Plugin job.
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 6f95e10..62a8b4b 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -1,7 +1,7 @@
 ---
 
 - nodeset:
-    name: devstack-tobiko
+    name: devstack-tobiko-focal
     nodes:
       - name: controller
         # label: ubuntu-focal
@@ -12,6 +12,15 @@
           - controller
 
 
+- nodeset:
+    name: devstack-tobiko-jammy
+    nodes:
+      - name: controller
+        # label: ubuntu-jammy
+        label: nested-virt-ubuntu-jammy
+    groups: *STANDALONE_GROUPS
+
+
 - nodeset:
     name: devstack-tobiko-centos
     nodes: