diff --git a/.zuul.yaml b/.zuul.yaml
index e376242..69e4562 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,10 +2,7 @@
 - job:
     name: scs-status-page-go-lint
     parent: golangci-lint
-    nodeset:
-      nodes:
-        - name: ubuntu-jammy
-          label: ubuntu-jammy
+    nodeset: pod-fedora-40
     vars:
       golangci_lint_version: 1.59.1
       go_version: 1.22.4
@@ -14,10 +11,7 @@
 - job:
     name: scs-status-page-go-test
     parent: golang-go
-    nodeset:
-      nodes:
-        - name: ubuntu-jammy
-          label: ubuntu-jammy
+    nodeset: pod-fedora-40
     vars:
       go_command: test ./...
       go_version: 1.22.4