diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 2189ea2a6..34d0e02ed 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -16,7 +16,7 @@
 - job:
     name: openstack-helm-lint
     run: playbooks/lint.yml
-    nodeset: ubuntu-bionic
+    nodeset: ubuntu-focal
     # NOTE(aostapenko) Required if job is run against another project
     required-projects:
       - openstack/openstack-helm-infra
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index fc2c26645..ddc11ee2a 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -15,7 +15,7 @@
     name: openstack-helm-single-node
     nodes:
       - name: primary
-        label: ubuntu-bionic
+        label: ubuntu-focal
     groups:
       - name: primary
         nodes:
@@ -25,11 +25,11 @@
     name: openstack-helm-ubuntu
     nodes:
       - name: primary
-        label: ubuntu-bionic
+        label: ubuntu-focal
       - name: node-1
-        label: ubuntu-bionic
+        label: ubuntu-focal
       - name: node-2
-        label: ubuntu-bionic
+        label: ubuntu-focal
     groups:
       - name: primary
         nodes: