diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index b8172d09f..8f946f132 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -81,7 +81,7 @@
     abstract: true
     nodeset: ubuntu-noble
     vars:
-      puppet: 7
+      puppet: 8
 
 - job:
     name: puppet-openstack-module-base
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 1af229bcf..e7f82715f 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -1,88 +1,4 @@
 ---
-- job:
-    name: puppet-openstack-integration-7
-    parent: puppet-openstack-integration-run-base
-    abstract: true
-    vars:
-      puppet: 7
-
-- job:
-    name: puppet-openstack-integration-7-scenario001
-    parent: puppet-openstack-integration-7
-    abstract: true
-    vars:
-      scenario: scenario001
-
-- job:
-    name: puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
-    parent: puppet-openstack-integration-7-scenario001
-    nodeset:
-      nodes:
-        - name: centos-9-stream
-          label: centos-9-stream
-
-- job:
-    name: puppet-openstack-integration-7-scenario002
-    parent: puppet-openstack-integration-7
-    abstract: true
-    vars:
-      scenario: scenario002
-
-- job:
-    name: puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
-    parent: puppet-openstack-integration-7-scenario002
-    nodeset:
-      nodes:
-        - name: centos-9-stream
-          label: centos-9-stream
-
-- job:
-    name: puppet-openstack-integration-7-scenario003
-    parent: puppet-openstack-integration-7
-    abstract: true
-    vars:
-      scenario: scenario003
-
-- job:
-    name: puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
-    parent: puppet-openstack-integration-7-scenario003
-    nodeset:
-      nodes:
-        - name: centos-9-stream
-          label: centos-9-stream
-
-- job:
-    name: puppet-openstack-integration-7-scenario004
-    parent: puppet-openstack-integration-7
-    abstract: true
-    vars:
-      scenario: scenario004
-
-- job:
-    name: puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
-    parent: puppet-openstack-integration-7-scenario004
-    nodeset:
-      nodes:
-        - name: centos-9-stream
-          label: centos-9-stream
-
-- job:
-    name: puppet-openstack-integration-7-scenario005
-    parent: puppet-openstack-integration-7
-    abstract: true
-    vars:
-      scenario: scenario005
-
-- job:
-    name: puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
-    parent: puppet-openstack-integration-7-scenario005
-    nodeset:
-      nodes:
-        - name: centos-9-stream
-          label: centos-9-stream
-
-### puppet 8 jobs ###
-
 - job:
     name: puppet-openstack-integration-8
     parent: puppet-openstack-integration-run-base
@@ -97,6 +13,14 @@
     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-scenario001-tempest-ubuntu-noble
     parent: puppet-openstack-integration-8-scenario001
@@ -110,6 +34,14 @@
     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-scenario002-tempest-ubuntu-noble
     parent: puppet-openstack-integration-8-scenario002
@@ -123,6 +55,14 @@
     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-scenario003-tempest-ubuntu-noble
     parent: puppet-openstack-integration-8-scenario003
@@ -136,6 +76,14 @@
     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-scenario004-tempest-ubuntu-noble
     parent: puppet-openstack-integration-8-scenario004
@@ -149,6 +97,14 @@
     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
+
 - job:
     name: puppet-openstack-integration-8-scenario005-tempest-ubuntu-noble
     parent: puppet-openstack-integration-8-scenario005
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index b1e14b795..0920b478c 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -8,12 +8,10 @@
     check:
       jobs:
         - puppet-openstack-lint-ubuntu-noble
-        - puppet-openstack-syntax-7-ubuntu-noble
         - puppet-openstack-syntax-8-ubuntu-noble
     gate:
       jobs:
         - puppet-openstack-lint-ubuntu-noble
-        - puppet-openstack-syntax-7-ubuntu-noble
         - puppet-openstack-syntax-8-ubuntu-noble
 
 - project:
@@ -27,22 +25,20 @@
     check:
       jobs:
         - puppet-openstack-libraries-puppet-lint-ubuntu-noble
-        - puppet-openstack-libraries-puppet-syntax-7-ubuntu-noble
         - puppet-openstack-libraries-puppet-syntax-8-ubuntu-noble
-        - puppet-openstack-libraries-puppet-unit-7.34-centos-9-stream
+        - puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-noble
-        - puppet-openstack-libraries-litmus-7.34-centos-9-stream
+        - puppet-openstack-libraries-litmus-8.10-centos-9-stream
         - puppet-openstack-libraries-litmus-8.10-ubuntu-noble
         - puppet-openstack-libraries-litmus-latest-ubuntu-noble
     gate:
       jobs:
         - puppet-openstack-libraries-puppet-lint-ubuntu-noble
-        - puppet-openstack-libraries-puppet-syntax-7-ubuntu-noble
         - puppet-openstack-libraries-puppet-syntax-8-ubuntu-noble
-        - puppet-openstack-libraries-puppet-unit-7.34-centos-9-stream
+        - puppet-openstack-libraries-puppet-unit-8.10-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
-        - puppet-openstack-libraries-litmus-7.34-centos-9-stream
+        - puppet-openstack-libraries-litmus-8.10-centos-9-stream
 
 # integration jobs
 - project-template:
@@ -54,11 +50,6 @@
         - puppet-openstack-integration-8-scenario003-tempest-ubuntu-noble
         - puppet-openstack-integration-8-scenario004-tempest-ubuntu-noble
         - puppet-openstack-integration-8-scenario005-tempest-ubuntu-noble
-        - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
-        - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
-        - 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
@@ -66,63 +57,58 @@
         - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
     gate:
       jobs:
-        - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
-        - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
-        - 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
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
         - puppet-openstack-integration-8-scenario001-tempest-ubuntu-noble
-        - 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
+        - puppet-openstack-integration-8-scenario001-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario002
     check:
       jobs:
         - puppet-openstack-integration-8-scenario002-tempest-ubuntu-noble
-        - 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
+        - puppet-openstack-integration-8-scenario002-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario003
     check:
       jobs:
         - puppet-openstack-integration-8-scenario003-tempest-ubuntu-noble
-        - 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
+        - puppet-openstack-integration-8-scenario003-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
         - puppet-openstack-integration-8-scenario004-tempest-ubuntu-noble
-        - 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
+        - puppet-openstack-integration-8-scenario004-tempest-centos-9-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario005
     check:
       jobs:
         - puppet-openstack-integration-8-scenario005-tempest-ubuntu-noble
-        - 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
+        - puppet-openstack-integration-8-scenario005-tempest-centos-9-stream
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 6621b782c..5cbd51159 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -2,11 +2,13 @@
 # This file contains the jobs for the puppet openstack libraries
 #
 - job:
-    name: puppet-openstack-libraries-puppet-unit-7.34-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
     vars:
-      puppet_gem_version: 7.34
+      puppet_gem_version: 8.10
+      dnf_modules:
+        ruby: 3.1
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 07dc5adce..07271cfbe 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -4,12 +4,6 @@
     parent: puppet-openstack-module-base
     run: playbooks/run-lint-tests.yaml
 
-- job:
-    name: puppet-openstack-syntax-7-ubuntu-noble
-    parent: puppet-openstack-syntax-base
-    vars:
-      puppet: 7
-
 - job:
     name: puppet-openstack-syntax-8-ubuntu-noble
     parent: puppet-openstack-syntax-base
@@ -21,12 +15,6 @@
     parent: puppet-openstack-module-base
     run: playbooks/run-libraries-lint-tests.yaml
 
-- job:
-    name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-noble
-    parent: puppet-openstack-libraries-puppet-syntax-base
-    vars:
-      puppet: 7
-
 - job:
     name: puppet-openstack-libraries-puppet-syntax-8-ubuntu-noble
     parent: puppet-openstack-libraries-puppet-syntax-base
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index 64b907c48..828c9a6b4 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -43,11 +43,13 @@
     run: playbooks/run-libraries-litmus-tests.yaml
 
 - job:
-    name: puppet-openstack-litmus-7.34-centos-9-stream
+    name: puppet-openstack-litmus-8.10-centos-9-stream
     parent: puppet-openstack-litmus-module-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.34
+      puppet_gem_version: 8.10
+      dnf_modules:
+        ruby: 3.1
 
 - job:
     name: puppet-openstack-litmus-8.10-ubuntu-noble
@@ -66,11 +68,13 @@
       puppet_gem_version: latest
 
 - job:
-    name: puppet-openstack-libraries-litmus-7.34-centos-9-stream
+    name: puppet-openstack-libraries-litmus-8.10-centos-9-stream
     parent: puppet-openstack-litmus-libraries-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.34
+      puppet_gem_version: 8.10
+      dnf_modules:
+        ruby: 3.1
 
 - job:
     name: puppet-openstack-libraries-litmus-8.10-ubuntu-noble
@@ -92,9 +96,9 @@
     name: puppet-openstack-litmus-jobs
     check:
       jobs:
-        - puppet-openstack-litmus-7.34-centos-9-stream
+        - puppet-openstack-litmus-8.10-centos-9-stream
         - puppet-openstack-litmus-8.10-ubuntu-noble
         - puppet-openstack-litmus-latest-ubuntu-noble
     gate:
       jobs:
-        - puppet-openstack-litmus-7.34-centos-9-stream
+        - puppet-openstack-litmus-8.10-centos-9-stream
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 03ab75ec8..e0554c009 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -2,11 +2,13 @@
 # This file contains the puppet unit job configurations
 #
 - job:
-    name: puppet-openstack-unit-7.34-centos-9-stream
+    name: puppet-openstack-unit-8.10-centos-9-stream
     parent: puppet-openstack-unit-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.34
+      puppet_gem_version: 8.10
+      dnf_modules:
+        ruby: 3.1
 
 - job:
     name: puppet-openstack-unit-8.10-ubuntu-noble
@@ -27,10 +29,10 @@
     name: puppet-openstack-module-unit-jobs
     check:
       jobs:
-        - puppet-openstack-unit-7.34-centos-9-stream
+        - puppet-openstack-unit-8.10-centos-9-stream
         - puppet-openstack-unit-8.10-ubuntu-noble
         - puppet-openstack-unit-latest-ubuntu-noble
     gate:
       jobs:
-        - puppet-openstack-unit-7.34-centos-9-stream
+        - puppet-openstack-unit-8.10-centos-9-stream
         - puppet-openstack-unit-8.10-ubuntu-noble