diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 9ecbd629..6f680012 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -20,8 +20,9 @@
       osa_test_repo: "openstack/openstack-ansible-lxc_container_create"
 
 - job:
-    name: openstack-ansible-lxc-dir-ubuntu-xenial
+    name: openstack-ansible-lxc-dir-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-bionic
     vars:
       tox_env: dir
 
@@ -46,9 +47,13 @@
     vars:
       tox_env: dir
 
+# NOTE(cloudnull): Job set to non-voting due to regression in bionic
+#                  https://github.com/lxc/lxc/issues/2612
 - job:
-    name: openstack-ansible-lxc-btrfs-ubuntu-xenial
+    name: openstack-ansible-lxc-btrfs-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-bionic
+    voting: false
     vars:
       tox_env: btrfs
 
@@ -74,8 +79,10 @@
       tox_env: btrfs
 
 - job:
-    name: openstack-ansible-lxc-machinectl-ubuntu-xenial
+    name: openstack-ansible-lxc-machinectl-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-bionic
+    voting: false
     vars:
       tox_env: mnctl
 
@@ -101,8 +108,9 @@
       tox_env: mnctl
 
 - job:
-    name: openstack-ansible-lxc-overlayfs-ubuntu-xenial
+    name: openstack-ansible-lxc-overlayfs-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-bionic
     vars:
       tox_env: ofs
 
@@ -128,7 +136,9 @@
       tox_env: ofs
 
 - job:
-    name: openstack-ansible-lxc-zfs-ubuntu-xenial
+    name: openstack-ansible-lxc-zfs-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-bionic
     vars:
       tox_env: zfs
+
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index b2b47525..ee761a23 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,17 +23,17 @@
         - openstack-ansible-lxc-dir-centos-7
         - openstack-ansible-lxc-dir-opensuse-423
         - openstack-ansible-lxc-dir-opensuse-150
-        - openstack-ansible-lxc-dir-ubuntu-xenial
-        - openstack-ansible-lxc-btrfs-ubuntu-xenial
+        - openstack-ansible-lxc-dir-ubuntu-bionic
+        - openstack-ansible-lxc-btrfs-ubuntu-bionic
         - openstack-ansible-lxc-btrfs-centos-7
         - openstack-ansible-lxc-btrfs-opensuse-423
         - openstack-ansible-lxc-btrfs-opensuse-150
-        - openstack-ansible-lxc-machinectl-ubuntu-xenial
+        - openstack-ansible-lxc-machinectl-ubuntu-bionic
         - openstack-ansible-lxc-machinectl-centos-7
         - openstack-ansible-lxc-machinectl-opensuse-423
         - openstack-ansible-lxc-machinectl-opensuse-150
-        - openstack-ansible-lxc-overlayfs-ubuntu-xenial
+        - openstack-ansible-lxc-overlayfs-ubuntu-bionic
         - openstack-ansible-lxc-overlayfs-centos-7
         - openstack-ansible-lxc-overlayfs-opensuse-423
         - openstack-ansible-lxc-overlayfs-opensuse-150
-        - openstack-ansible-lxc-zfs-ubuntu-xenial
+        - openstack-ansible-lxc-zfs-ubuntu-bionic