diff --git a/.zuul.d/base.yaml b/.zuul.d/base.yaml
index 78e2d5654b..203ead2b40 100644
--- a/.zuul.d/base.yaml
+++ b/.zuul.d/base.yaml
@@ -32,10 +32,10 @@
         label: centos-7
 
 - nodeset:
-    name: kolla-ubuntu
+    name: kolla-ubuntu-bionic
     nodes:
       - name: primary
-        label: ubuntu-xenial
+        label: ubuntu-bionic
 
 - job:
     name: kolla-base
diff --git a/.zuul.d/ubuntu.yaml b/.zuul.d/ubuntu.yaml
index cda9f9be26..1c6840e64e 100644
--- a/.zuul.d/ubuntu.yaml
+++ b/.zuul.d/ubuntu.yaml
@@ -23,7 +23,7 @@
 - job:
     name: kolla-build-ubuntu-binary
     parent: kolla-base
-    nodeset: kolla-ubuntu
+    nodeset: kolla-ubuntu-bionic
     voting: false
     vars:
       action: build
@@ -42,7 +42,7 @@
 - job:
     name: kolla-build-ubuntu-source
     parent: kolla-base
-    nodeset: kolla-ubuntu
+    nodeset: kolla-ubuntu-bionic
     vars:
       action: build
       base_distro: ubuntu