diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 177926311..f0c3a0284 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -110,3 +110,88 @@
       nodes:
         - name: centos-9-stream
           label: centos-9-stream
+
+### puppet 8 jobs ###
+
+- job:
+    name: puppet-openstack-integration-8
+    parent: puppet-openstack-integration-run-base
+    abstract: true
+    voting: false
+    vars:
+      puppet: 8
+
+- job:
+    name: puppet-openstack-integration-8-scenario001
+    parent: puppet-openstack-integration-8
+    abstract: true
+    vars:
+      scenario: scenario001
+
+- job:
+    name: puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
+    parent: puppet-openstack-integration-8-scenario001
+    nodeset:
+      nodes:
+        - name: centos-9-stream
+          label: centos-9-stream
+
+- job:
+    name: puppet-openstack-integration-8-scenario002
+    parent: puppet-openstack-integration-8
+    abstract: true
+    vars:
+      scenario: scenario002
+
+- job:
+    name: puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
+    parent: puppet-openstack-integration-8-scenario002
+    nodeset:
+      nodes:
+        - name: centos-9-stream
+          label: centos-9-stream
+
+- job:
+    name: puppet-openstack-integration-8-scenario003
+    parent: puppet-openstack-integration-8
+    abstract: true
+    vars:
+      scenario: scenario003
+
+- job:
+    name: puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
+    parent: puppet-openstack-integration-8-scenario003
+    nodeset:
+      nodes:
+        - name: centos-9-stream
+          label: centos-9-stream
+
+- job:
+    name: puppet-openstack-integration-8-scenario004
+    parent: puppet-openstack-integration-8
+    abstract: true
+    vars:
+      scenario: scenario004
+
+- job:
+    name: puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
+    parent: puppet-openstack-integration-8-scenario004
+    nodeset:
+      nodes:
+        - name: centos-9-stream
+          label: centos-9-stream
+
+- job:
+    name: puppet-openstack-integration-8-scenario005
+    parent: puppet-openstack-integration-8
+    abstract: true
+    vars:
+      scenario: scenario005
+
+- job:
+    name: puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
+    parent: puppet-openstack-integration-8-scenario005
+    nodeset:
+      nodes:
+        - name: centos-9-stream
+          label: centos-9-stream
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2624b2ad3..b2d8609b3 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -42,6 +42,9 @@
         - puppet-openstack-libraries-puppet-unit-7.29-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-7.29-ubuntu-jammy
         - puppet-openstack-libraries-litmus-7.29-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-libraries-litmus-8.5-centos-9-stream
 
 # integration jobs
 - project-template:
@@ -65,6 +68,13 @@
         - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
         - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
         - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario001
@@ -75,6 +85,9 @@
     gate:
       jobs:
         - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario002
@@ -85,6 +98,9 @@
     gate:
       jobs:
         - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario003
@@ -95,6 +111,9 @@
     gate:
       jobs:
         - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario004
@@ -105,6 +124,9 @@
     gate:
       jobs:
         - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario005
@@ -115,3 +137,6 @@
     gate:
       jobs:
         - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index 46ff71619..008411e86 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -56,6 +56,16 @@
     vars:
       puppet_gem_version: 7.29
 
+- job:
+    name: puppet-openstack-litmus-8.5-centos-9-stream
+    parent: puppet-openstack-litmus-module-base
+    nodeset: centos-9-stream
+    voting: false
+    vars:
+      puppet_gem_version: 8.5
+      dnf_modules:
+        ruby: 3.1
+
 - job:
     name: puppet-openstack-litmus-latest-ubuntu-jammy
     parent: puppet-openstack-litmus-module-base
@@ -74,11 +84,21 @@
 - job:
     name: puppet-openstack-libraries-litmus-7.29-ubuntu-jammy
     parent: puppet-openstack-litmus-libraries-base
-    voting: false
     nodeset: ubuntu-jammy
+    voting: false
     vars:
       puppet_gem_version: 7.29
 
+- job:
+    name: puppet-openstack-libraries-litmus-8.5-centos-9-stream
+    parent: puppet-openstack-litmus-libraries-base
+    nodeset: centos-9-stream
+    voting: false
+    vars:
+      puppet_gem_version: 8.5
+      dnf_modules:
+        ruby: 3.1
+
 - job:
     name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy
     parent: puppet-openstack-litmus-libraries-base
@@ -97,3 +117,6 @@
     gate:
       jobs:
         - puppet-openstack-litmus-7.29-centos-9-stream
+    experimental:
+      jobs:
+        - puppet-openstack-litmus-8.5-centos-9-stream