diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 70e7be271e..4e2c4e2cd2 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -11,7 +11,7 @@
 - job:
     name: kolla-ansible-debian-source-aarch64
     parent: kolla-ansible-debian-source
-    nodeset: kolla-ansible-debian-aarch64
+    nodeset: kolla-ansible-debian-bullseye-aarch64
     voting: false
     timeout: 10800
     required-projects:
@@ -20,7 +20,7 @@
 - job:
     name: kolla-ansible-debian-source
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-debian
+    nodeset: kolla-ansible-debian-bullseye
     voting: false
     vars:
       base_distro: debian
@@ -134,7 +134,7 @@
 - job:
     name: kolla-ansible-debian-source-upgrade
     parent: kolla-ansible-base
-    nodeset: kolla-ansible-debian
+    nodeset: kolla-ansible-debian-buster
     timeout: 9000
     voting: false
     vars:
@@ -146,7 +146,7 @@
 - job:
     name: kolla-ansible-debian-source-upgrade-aarch64
     parent: kolla-ansible-debian-source-upgrade
-    nodeset: kolla-ansible-debian-aarch64
+    nodeset: kolla-ansible-debian-buster-aarch64
 
 - job:
     name: kolla-ansible-ubuntu-source-upgrade
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index 0c40dd7fce..066d5346ca 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -12,17 +12,29 @@
         label: centos-8-stream
 
 - nodeset:
-    name: kolla-ansible-debian
+    name: kolla-ansible-debian-buster
     nodes:
       - name: primary
         label: debian-buster
 
 - nodeset:
-    name: kolla-ansible-debian-aarch64
+    name: kolla-ansible-debian-buster-aarch64
     nodes:
       - name: primary
         label: debian-buster-arm64
 
+- nodeset:
+    name: kolla-ansible-debian-bullseye
+    nodes:
+      - name: primary
+        label: debian-bullseye
+
+- nodeset:
+    name: kolla-ansible-debian-bullseye-aarch64
+    nodes:
+      - name: primary
+        label: debian-bullseye-arm64
+
 - nodeset:
     name: kolla-ansible-focal
     nodes: