diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index ac33b3968..13fc3a016 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -7,16 +7,16 @@
     name: puppet-openstack-check-jobs
     check:
       jobs:
-        - puppet-openstack-lint
-        - puppet-openstack-syntax-4
-        - puppet-openstack-syntax-5
-        - puppet-openstack-syntax-6
+        - puppet-openstack-lint-ubuntu-bionic
+        - puppet-openstack-syntax-4-ubuntu-bionic
+        - puppet-openstack-syntax-5-ubuntu-bionic
+        - puppet-openstack-syntax-6-ubuntu-bionic
     gate:
       jobs:
-        - puppet-openstack-lint
-        - puppet-openstack-syntax-4
-        - puppet-openstack-syntax-5
-        - puppet-openstack-syntax-6
+        - puppet-openstack-lint-ubuntu-bionic
+        - puppet-openstack-syntax-4-ubuntu-bionic
+        - puppet-openstack-syntax-5-ubuntu-bionic
+        - puppet-openstack-syntax-6-ubuntu-bionic
 
 - project:
     templates:
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 63d022999..d8af39fb1 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -1,5 +1,5 @@
 - job:
-    name: puppet-openstack-lint
+    name: puppet-openstack-lint-ubuntu-bionic
     parent: puppet-openstack-module-base
     run: playbooks/run-lint-tests.yaml
     irrelevant-files:
@@ -10,19 +10,19 @@
       - ^test-requirements.txt$
 
 - job:
-    name: puppet-openstack-syntax-4
+    name: puppet-openstack-syntax-4-ubuntu-bionic
     parent: puppet-openstack-syntax-base
     vars:
       puppet: 4
 
 - job:
-    name: puppet-openstack-syntax-5
+    name: puppet-openstack-syntax-5-ubuntu-bionic
     parent: puppet-openstack-syntax-base
     vars:
       puppet: 5
 
 - job:
-    name: puppet-openstack-syntax-6
+    name: puppet-openstack-syntax-6-ubuntu-bionic
     parent: puppet-openstack-syntax-base
     vars:
       puppet: 6