diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index e7c92fc40..ea0628da5 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -31,9 +31,13 @@
         - 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-5-centos-8
+        - puppet-openstack-libraries-puppet-syntax-6-centos-8
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-4.10-centos-7
         - puppet-openstack-libraries-puppet-unit-5.5-centos-7
+        - puppet-openstack-libraries-puppet-unit-5.5-centos-8
+        - puppet-openstack-libraries-puppet-unit-6.11-centos-8
         - puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-bionic
         - puppet-openstack-libraries-puppet-beaker-rspec-centos-7
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index eb247ebe2..d8e667a70 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -16,6 +16,23 @@
     vars:
       puppet_gem_version: 5.5
 
+- job:
+    name: puppet-openstack-libraries-puppet-unit-5.5-centos-8
+    parent: puppet-openstack-libraries-puppet-unit-base
+    nodeset: centos-8
+    voting: false
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    vars:
+      puppet_gem_version: 5.5
+
+- job:
+    name: puppet-openstack-libraries-puppet-unit-6.11-centos-8
+    parent: puppet-openstack-libraries-puppet-unit-base
+    nodeset: centos-8
+    voting: false
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    vars:
+      puppet_gem_version: 6.11
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-6.11-ubuntu-bionic
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 7352161e4..48ae88685 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -74,3 +74,21 @@
     branches: ^(?!stable/(ocata|pike|queens|rocky|jewel|mimic|luminous)).*$
     vars:
       puppet: 6
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-5-centos-8
+    parent: puppet-openstack-libraries-puppet-syntax
+    nodeset: centos-8
+    voting: false
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    vars:
+      puppet: 5
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-6-centos-8
+    parent: puppet-openstack-libraries-puppet-syntax
+    nodeset: centos-8
+    voting: false
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    vars:
+      puppet: 6
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 9d8b57b16..7366e15a9 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -16,6 +16,24 @@
     vars:
       puppet_gem_version: 5.5
 
+- job:
+    name: puppet-openstack-unit-5.5-centos-8
+    parent: puppet-openstack-unit-base
+    nodeset: centos-8
+    voting: false
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    vars:
+      puppet_gem_version: 5.5
+
+- job:
+    name: puppet-openstack-unit-6.11-centos-8
+    parent: puppet-openstack-unit-base
+    nodeset: centos-8
+    voting: false
+    branches: ^(?!stable/(ocata|pike|queens|rocky|stein)).*$
+    vars:
+      puppet_gem_version: 6.11
+
 - job:
     name: puppet-openstack-unit-6.11-ubuntu-bionic
     parent: puppet-openstack-unit-base
@@ -42,6 +60,8 @@
       jobs:
         - puppet-openstack-unit-4.10-centos-7
         - puppet-openstack-unit-5.5-centos-7
+        - puppet-openstack-unit-5.5-centos-8
+        - puppet-openstack-unit-6.11-centos-8
         - puppet-openstack-unit-6.11-ubuntu-bionic
         - puppet-openstack-unit-latest-ubuntu-bionic
     gate: