diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index a85997481..1235c3308 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -1,4 +1,3 @@
-
 - job:
     name: puppet-openstack-integration-base
     abstract: true
@@ -184,4 +183,3 @@
     voting: false
     vars:
       nodepool_type: bionic
-
diff --git a/zuul.d/beaker.yaml b/zuul.d/beaker.yaml
index 29ec644a1..1e429314d 100644
--- a/zuul.d/beaker.yaml
+++ b/zuul.d/beaker.yaml
@@ -1,4 +1,3 @@
-
 - project-template:
     name: puppet-openstack-beaker-jobs
     check:
@@ -51,5 +50,3 @@
       - ^.gitignore$
     vars:
       nodepool_type: bionic
-
-
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 93f4b091e..48bea40f3 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -1,5 +1,4 @@
 ---
-
 - job:
     name: puppet-openstack-integration-4
     parent: puppet-openstack-integration-run-base
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 43a43e7ad..ac33b3968 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -28,7 +28,7 @@
     name: puppet-openstack-library-jobs
     check:
       jobs:
-        - puppet-openstack-libraries-puppet-lint-centos-7
+        - puppet-openstack-libraries-puppet-lint-ubuntu-bionic
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
@@ -40,7 +40,7 @@
         - puppet-openstack-libraries-puppet-beaker-rspec-ubuntu-bionic
     gate:
       jobs:
-        - puppet-openstack-libraries-puppet-lint-centos-7
+        - puppet-openstack-libraries-puppet-lint-ubuntu-bionic
         - puppet-openstack-libraries-puppet-syntax-4-centos-7
         - puppet-openstack-libraries-puppet-syntax-5-centos-7
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index e03e6b2b9..63d022999 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -28,12 +28,11 @@
       puppet: 6
 
 - job:
-    name: puppet-openstack-libraries-puppet-lint-centos-7
+    name: puppet-openstack-libraries-puppet-lint-ubuntu-bionic
     parent: puppet-openstack-integration-base
     run: playbooks/run-libraries-lint-tests.yaml
     pre-run: playbooks/prepare-node-unit.yaml
     timeout: 3600
-    nodeset: centos-7
 
 - job:
     name: puppet-openstack-libraries-puppet-syntax
@@ -69,8 +68,5 @@
 - job:
     name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
     parent: puppet-openstack-libraries-puppet-syntax
-    nodeset: ubuntu-bionic
     vars:
       puppet: 6
-
-