diff --git a/.zuul.yaml b/.zuul.yaml
index 174875a5..041ddde2 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -18,7 +18,7 @@
       rtd_project_name: 'airship-promenade'
     check:
       jobs:
-        - openstack-tox-pep8
+        - openstack-tox-pep8-bionic
         - airship-promenade-lint-ws
         - airship-promenade-docker-build-gate-ubuntu_xenial
         - airship-promenade-docker-build-gate-ubuntu_bionic
@@ -30,7 +30,7 @@
 
     gate:
       jobs:
-        - openstack-tox-pep8
+        - openstack-tox-pep8-bionic
         - airship-promenade-lint-ws
         - airship-promenade-docker-build-gate-ubuntu_xenial
         - airship-promenade-docker-build-gate-ubuntu_bionic
diff --git a/tools/zuul/playbooks/docker-image-build.yaml b/tools/zuul/playbooks/docker-image-build.yaml
index bccd4f80..0858038d 100644
--- a/tools/zuul/playbooks/docker-image-build.yaml
+++ b/tools/zuul/playbooks/docker-image-build.yaml
@@ -27,7 +27,7 @@
         - apt_key:
             url: https://download.docker.com/linux/ubuntu/gpg
         - apt_repository:
-            repo: deb http://{{ zuul_site_mirror_fqdn }}/deb-docker xenial stable
+            repo: deb http://{{ zuul_site_mirror_fqdn }}/deb-docker/{{ ansible_distribution_release }} {{ ansible_distribution_release }} stable
         - apt:
             name: "{{ item }}"
             allow_unauthenticated: True