diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 91aca8bb..e7319158 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -26,6 +26,13 @@
     vars:
       tox_env: dir
 
+- job:
+    name: openstack-ansible-lxc-dir-ubuntu-focal
+    parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-focal
+    vars:
+      tox_env: dir
+
 - job:
     name: openstack-ansible-lxc-dir-centos-7
     parent: openstack-ansible-lxc-container-create
@@ -33,13 +40,17 @@
     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-bionic
     parent: openstack-ansible-lxc-container-create
     nodeset: ubuntu-bionic
-    voting: false
+    vars:
+      tox_env: btrfs
+
+- job:
+    name: openstack-ansible-lxc-btrfs-ubuntu-focal
+    parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-focal
     vars:
       tox_env: btrfs
 
@@ -47,7 +58,13 @@
     name: openstack-ansible-lxc-machinectl-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
     nodeset: ubuntu-bionic
-    voting: false
+    vars:
+      tox_env: mnctl
+
+- job:
+    name: openstack-ansible-lxc-machinectl-ubuntu-focal
+    parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-focal
     vars:
       tox_env: mnctl
 
@@ -65,6 +82,13 @@
     vars:
       tox_env: ofs
 
+- job:
+    name: openstack-ansible-lxc-overlayfs-ubuntu-focal
+    parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-focal
+    vars:
+      tox_env: ofs
+
 - job:
     name: openstack-ansible-lxc-zfs-ubuntu-bionic
     parent: openstack-ansible-lxc-container-create
@@ -72,3 +96,10 @@
     vars:
       tox_env: zfs
 
+- job:
+    name: openstack-ansible-lxc-zfs-ubuntu-focal
+    parent: openstack-ansible-lxc-container-create
+    nodeset: ubuntu-focal
+    vars:
+      tox_env: zfs
+
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index db4c45e0..b9c4efc3 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -23,8 +23,13 @@
       jobs:
         - openstack-ansible-lxc-dir-centos-7
         - openstack-ansible-lxc-dir-ubuntu-bionic
+        - openstack-ansible-lxc-dir-ubuntu-focal
         - openstack-ansible-lxc-btrfs-ubuntu-bionic
+        - openstack-ansible-lxc-btrfs-ubuntu-focal
         - openstack-ansible-lxc-machinectl-ubuntu-bionic
+        - openstack-ansible-lxc-machinectl-ubuntu-focal
         - openstack-ansible-lxc-machinectl-centos-7
         - openstack-ansible-lxc-overlayfs-ubuntu-bionic
+        - openstack-ansible-lxc-overlayfs-ubuntu-focal
         - openstack-ansible-lxc-zfs-ubuntu-bionic
+        - openstack-ansible-lxc-zfs-ubuntu-focal