diff --git a/.zuul.yaml b/.zuul.yaml
index 4e9c02a..c269ffb 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -26,7 +26,7 @@
       - python-builder-3.8-bullseye-container-image
       - python-base-3.8-bullseye-container-image
     provides: zuul-registry-container-image
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
     vars: &image_vars
       docker_images:
         - context: .
@@ -44,7 +44,7 @@
     allowed-projects: zuul/zuul-registry
     run: playbooks/functional-test/run.yaml
     post-run: playbooks/functional-test/post.yaml
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
     secrets:
       name: docker_credentials
       secret: zuul-registry-dockerhub