diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml
index 27d152d2..45bb1b95 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -109,3 +109,8 @@ lxc_container_default_interfaces: |
   ONBOOT=yes
   NM_CONTROLLED=no
   TYPE=Ethernet
+
+# The value is specified in seconds, with the default being 20 minutes. This is
+#  double the amount of time used by default to mitigate issues with slow
+#  mirrors / testing nodes.
+lxc_cache_prep_timeout: 1200
diff --git a/vars/suse-42.yml b/vars/suse-42.yml
index 5f7e356b..aa905344 100644
--- a/vars/suse-42.yml
+++ b/vars/suse-42.yml
@@ -59,7 +59,7 @@ lxc_cache_map:
     # We have (tried to!) copied repo-oss and repo-update from the host so wipe everything else.
     find /etc/zypp/repos.d/ -type f ! -name "repo-oss.repo" -a ! -name "repo-update.repo" -delete
     zypper lr | grep -q 'repo-oss' || zypper --quiet ar {{ lxc_hosts_opensuse_mirror_url }}/distribution/leap/{{ ansible_distribution_version }}/repo/oss repo-oss
-    zypper lr | grep -q 'repo-update' || zypper --quiet ar {{ lxc_hosts_opensuse_mirror_url }}/update/leap/{{ ansible_distribution_version }}/oss/ repo-update
+    zypper lr | grep -q 'repo-update' || zypper --quiet ar {{ lxc_hosts_opensuse_mirror_url }}/update/leap/{{ ansible_distribution_version }}/oss repo-update
     # Disable recommended packages. Only update what's really needed
     if ! fgrep -qx "solver.onlyRequires = true" /etc/zypp/zypp.conf; then
         echo -e "\n\n## Disable recommended packages\nsolver.onlyRequires = true" >> /etc/zypp/zypp.conf
@@ -84,6 +84,7 @@ lxc_cache_map:
 _lxc_cache_distro_packages:
   - ca-certificates-mozilla
   - cronie
+  - dbus-1
   - openssh
   - python
   - python-xml
@@ -104,3 +105,8 @@ lxc_cached_network_interfaces:
 lxc_container_default_interfaces: |
   STARTMODE=auto
   BOOTPROTO=dhcp
+
+# The value is specified in seconds, with the default being 20 minutes. This is
+#  double the amount of time used by default to mitigate issues with slow
+#  mirrors / testing nodes.
+lxc_cache_prep_timeout: 1200
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 0751f16d..dd774d22 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -22,36 +22,45 @@
       osa_test_repo: "openstack/openstack-ansible-lxc_container_create"
 
 - job:
-    name: openstack-ansible-lxc-dir
+    name: openstack-ansible-lxc-dir-ubuntu-xenial
     parent: openstack-ansible-lxc-container-create
-    voting: false
     vars:
       tox_env: dir
 
 - job:
-    name: openstack-ansible-lxc-btrfs
+    name: openstack-ansible-lxc-dir-centos-7
+    parent: openstack-ansible-lxc-container-create
+    nodeset: centos-7
+    vars:
+      tox_env: dir
+
+- job:
+    name: openstack-ansible-lxc-dir-opensuse-423
+    parent: openstack-ansible-lxc-container-create
+    nodeset: opensuse-423
+    vars:
+      tox_env: dir
+
+- job:
+    name: openstack-ansible-lxc-btrfs-ubuntu-xenial
     parent: openstack-ansible-lxc-container-create
-    voting: false
     vars:
       tox_env: btrfs
 
 - job:
-    name: openstack-ansible-lxc-machinectl
+    name: openstack-ansible-lxc-machinectl-ubuntu-xenial
     parent: openstack-ansible-lxc-container-create
-    voting: false
     vars:
       tox_env: mnctl
 
 - job:
-    name: openstack-ansible-lxc-overlayfs
+    name: openstack-ansible-lxc-overlayfs-ubuntu-xenial
     parent: openstack-ansible-lxc-container-create
-    voting: false
     vars:
       tox_env: ofs
 
 - job:
-    name: openstack-ansible-lxc-zfs
+    name: openstack-ansible-lxc-zfs-ubuntu-xenial
     parent: openstack-ansible-lxc-container-create
-    voting: false
     vars:
       tox_env: zfs
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0a86e214..b1f1cb35 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -21,11 +21,13 @@
         - openstack-ansible-functional-centos-7
         - openstack-ansible-functional-opensuse-423
         - openstack-ansible-functional-ubuntu-xenial
-        - openstack-ansible-lxc-dir
-        - openstack-ansible-lxc-btrfs
-        - openstack-ansible-lxc-machinectl
-        - openstack-ansible-lxc-overlayfs
-        - openstack-ansible-lxc-zfs
+        - openstack-ansible-lxc-dir-centos-7
+        - openstack-ansible-lxc-dir-opensuse-423
+        - openstack-ansible-lxc-dir-ubuntu-xenial
+        - openstack-ansible-lxc-btrfs-ubuntu-xenial
+        - openstack-ansible-lxc-machinectl-ubuntu-xenial
+        - openstack-ansible-lxc-overlayfs-ubuntu-xenial
+        - openstack-ansible-lxc-zfs-ubuntu-xenial
     gate:
       jobs:
         - openstack-ansible-linters