diff --git a/zuul.d/system-config-roles.yaml b/zuul.d/system-config-roles.yaml
index 672f2e4505..a00ed51831 100644
--- a/zuul.d/system-config-roles.yaml
+++ b/zuul.d/system-config-roles.yaml
@@ -15,6 +15,7 @@
       - roles/puppet-install
       - roles/openafs-client
       - roles/kerberos-client
+      - roles-test/
     vars:
       zuul_copy_output: "{{ copy_output | combine(host_copy_output | default({})) }}"
       stage_dir: "{{ ansible_user_dir }}/zuul-output"
@@ -22,7 +23,7 @@
         '/var/log/syslog': logs_txt
         '/var/log/messages': logs_txt
         '/var/log/openafs': logs
-        # for build logs on centos
+        # for build logs
         '/var/lib/dkms-make-logs': logs
 
 - job:
@@ -114,18 +115,6 @@
           nodes:
             - base
 
-- job:
-    name: system-config-zuul-role-integration-debian-buster
-    parent: system-config-zuul-role-integration
-    nodeset:
-      nodes:
-        - name: base
-          label: debian-buster
-      groups:
-        - name: openafs
-          nodes:
-            - base
-
 - job:
     name: system-config-zuul-role-integration-debian-bullseye
     parent: system-config-zuul-role-integration
@@ -139,12 +128,12 @@
             - base
 
 - job:
-    name: system-config-zuul-role-integration-debian-buster-arm64
+    name: system-config-zuul-role-integration-debian-bookworm
     parent: system-config-zuul-role-integration
     nodeset:
       nodes:
         - name: base
-          label: debian-buster-arm64
+          label: debian-bookworm
       groups:
         - name: openafs
           nodes:
@@ -162,6 +151,19 @@
           nodes:
             - base
 
+- job:
+    name: system-config-zuul-role-integration-debian-bookworm-arm64
+    parent: system-config-zuul-role-integration
+    voting: false
+    nodeset:
+      nodes:
+        - name: base
+          label: debian-bookworm-arm64
+      groups:
+        - name: openafs
+          nodes:
+            - base
+
 - job:
     name: system-config-zuul-role-integration-centos-8-stream
     parent: system-config-zuul-role-integration
@@ -221,10 +223,10 @@
         - system-config-zuul-role-integration-focal-arm64
         - system-config-zuul-role-integration-jammy
         - system-config-zuul-role-integration-jammy-arm64
-        - system-config-zuul-role-integration-debian-buster
-        - system-config-zuul-role-integration-debian-buster-arm64
         - system-config-zuul-role-integration-debian-bullseye
         - system-config-zuul-role-integration-debian-bullseye-arm64
+        - system-config-zuul-role-integration-debian-bookworm
+        - system-config-zuul-role-integration-debian-bookworm-arm64
         - system-config-zuul-role-integration-centos-8-stream
         - system-config-zuul-role-integration-centos-8-stream-arm64
         - system-config-zuul-role-integration-centos-9-stream
@@ -238,10 +240,10 @@
         - system-config-zuul-role-integration-focal-arm64
         - system-config-zuul-role-integration-jammy
         - system-config-zuul-role-integration-jammy-arm64
-        - system-config-zuul-role-integration-debian-buster
-        - system-config-zuul-role-integration-debian-buster-arm64
         - system-config-zuul-role-integration-debian-bullseye
         - system-config-zuul-role-integration-debian-bullseye-arm64
+        - system-config-zuul-role-integration-debian-bookworm
+        - system-config-zuul-role-integration-debian-bookworm-arm64
         - system-config-zuul-role-integration-centos-8-stream
         - system-config-zuul-role-integration-centos-8-stream-arm64
         - system-config-zuul-role-integration-centos-9-stream