diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index f0c3a0284..08a31546a 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -117,7 +117,6 @@
     name: puppet-openstack-integration-8
     parent: puppet-openstack-integration-run-base
     abstract: true
-    voting: false
     vars:
       puppet: 8
 
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index b2d8609b3..22d9efc88 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -30,10 +30,13 @@
         - puppet-openstack-libraries-puppet-syntax-8-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-7.29-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-7.29-ubuntu-jammy
-        - puppet-openstack-libraries-puppet-unit-8.5-centos-9-stream
+        - puppet-openstack-libraries-litmus-7.29-centos-9-stream
+        - puppet-openstack-libraries-litmus-7.29-ubuntu-jammy
+        - puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy
         - puppet-openstack-libraries-litmus-7.29-centos-9-stream
         - puppet-openstack-libraries-litmus-7.29-ubuntu-jammy
+        - puppet-openstack-libraries-litmus-8.10-centos-9-stream
         - puppet-openstack-libraries-litmus-latest-ubuntu-jammy
     gate:
       jobs:
@@ -42,9 +45,6 @@
         - 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:
@@ -61,6 +61,11 @@
         - 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
+        - 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
     gate:
       jobs:
         - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
@@ -68,13 +73,6 @@
         - 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
@@ -82,12 +80,10 @@
       jobs:
         - puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
     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
@@ -95,12 +91,10 @@
       jobs:
         - puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
     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
@@ -108,12 +102,10 @@
       jobs:
         - puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
     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
@@ -121,12 +113,10 @@
       jobs:
         - puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
     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
@@ -134,9 +124,7 @@
       jobs:
         - puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
+        - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
     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/libraries.yaml b/zuul.d/libraries.yaml
index 26b757fdd..71e581d45 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -16,12 +16,11 @@
       puppet_gem_version: 7.29
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-8.5-centos-9-stream
+    name: puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream
     parent: puppet-openstack-libraries-puppet-unit-base
     nodeset: centos-9-stream
-    voting: false
     vars:
-      puppet_gem_version: 8.5
+      puppet_gem_version: 8.10
       dnf_modules:
         ruby: 3.1
 
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index 008411e86..fe79b94cb 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -57,12 +57,12 @@
       puppet_gem_version: 7.29
 
 - job:
-    name: puppet-openstack-litmus-8.5-centos-9-stream
+    name: puppet-openstack-litmus-8.10-centos-9-stream
     parent: puppet-openstack-litmus-module-base
     nodeset: centos-9-stream
     voting: false
     vars:
-      puppet_gem_version: 8.5
+      puppet_gem_version: 8.10
       dnf_modules:
         ruby: 3.1
 
@@ -90,12 +90,12 @@
       puppet_gem_version: 7.29
 
 - job:
-    name: puppet-openstack-libraries-litmus-8.5-centos-9-stream
+    name: puppet-openstack-libraries-litmus-8.10-centos-9-stream
     parent: puppet-openstack-litmus-libraries-base
     nodeset: centos-9-stream
     voting: false
     vars:
-      puppet_gem_version: 8.5
+      puppet_gem_version: 8.10
       dnf_modules:
         ruby: 3.1
 
@@ -113,10 +113,8 @@
       jobs:
         - puppet-openstack-litmus-7.29-centos-9-stream
         - puppet-openstack-litmus-7.29-ubuntu-jammy
+        - puppet-openstack-litmus-8.10-centos-9-stream
         - puppet-openstack-litmus-latest-ubuntu-jammy
     gate:
       jobs:
         - puppet-openstack-litmus-7.29-centos-9-stream
-    experimental:
-      jobs:
-        - puppet-openstack-litmus-8.5-centos-9-stream
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 3e8ce8537..6d531b91f 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -16,12 +16,11 @@
       puppet_gem_version: 7.29
 
 - job:
-    name: puppet-openstack-unit-8.5-centos-9-stream
+    name: puppet-openstack-unit-8.10-centos-9-stream
     parent: puppet-openstack-unit-base
     nodeset: centos-9-stream
-    voting: false
     vars:
-      puppet_gem_version: 8.5
+      puppet_gem_version: 8.10
       dnf_modules:
         ruby: 3.1
 
@@ -39,9 +38,10 @@
       jobs:
         - puppet-openstack-unit-7.29-centos-9-stream
         - puppet-openstack-unit-7.29-ubuntu-jammy
-        - puppet-openstack-unit-8.5-centos-9-stream
+        - puppet-openstack-unit-8.10-centos-9-stream
         - puppet-openstack-unit-latest-ubuntu-jammy
     gate:
       jobs:
         - puppet-openstack-unit-7.29-centos-9-stream
         - puppet-openstack-unit-7.29-ubuntu-jammy
+        - puppet-openstack-unit-8.10-centos-9-stream