diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 2e63bf6a2..41ca1f839 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -29,20 +29,20 @@
         - 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.35-centos-9-stream
-        - puppet-openstack-libraries-puppet-unit-8.11-ubuntu-noble
+        - puppet-openstack-libraries-puppet-unit-7.32-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.35-centos-9-stream
-        - puppet-openstack-libraries-litmus-8.11-ubuntu-noble
+        - puppet-openstack-libraries-litmus-7.32-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.35-centos-9-stream
-        - puppet-openstack-libraries-puppet-unit-8.11-ubuntu-noble
-        - puppet-openstack-libraries-litmus-7.35-centos-9-stream
+        - puppet-openstack-libraries-puppet-unit-7.32-centos-9-stream
+        - puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
+        - puppet-openstack-libraries-litmus-7.32-centos-9-stream
 
 # integration jobs
 - project-template:
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 2c0d3c117..650cab453 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -2,18 +2,18 @@
 # This file contains the jobs for the puppet openstack libraries
 #
 - job:
-    name: puppet-openstack-libraries-puppet-unit-7.35-centos-9-stream
+    name: puppet-openstack-libraries-puppet-unit-7.32-centos-9-stream
     parent: puppet-openstack-libraries-puppet-unit-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.35
+      puppet_gem_version: 7.32
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-8.11-ubuntu-noble
+    name: puppet-openstack-libraries-puppet-unit-8.10-ubuntu-noble
     parent: puppet-openstack-libraries-puppet-unit-base
     nodeset: ubuntu-noble
     vars:
-      puppet_gem_version: 8.11
+      puppet_gem_version: 8.10
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-noble
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index e9db8e7f6..93fd1a21f 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -43,19 +43,19 @@
     run: playbooks/run-libraries-litmus-tests.yaml
 
 - job:
-    name: puppet-openstack-litmus-7.35-centos-9-stream
+    name: puppet-openstack-litmus-7.32-centos-9-stream
     parent: puppet-openstack-litmus-module-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.35
+      puppet_gem_version: 7.32
 
 - job:
-    name: puppet-openstack-litmus-8.11-ubuntu-noble
+    name: puppet-openstack-litmus-8.10-ubuntu-noble
     parent: puppet-openstack-litmus-module-base
     nodeset: ubuntu-noble
     voting: false
     vars:
-      puppet_gem_version: 8.11
+      puppet_gem_version: 8.10
 
 - job:
     name: puppet-openstack-litmus-latest-ubuntu-noble
@@ -66,19 +66,19 @@
       puppet_gem_version: latest
 
 - job:
-    name: puppet-openstack-libraries-litmus-7.35-centos-9-stream
+    name: puppet-openstack-libraries-litmus-7.32-centos-9-stream
     parent: puppet-openstack-litmus-libraries-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.35
+      puppet_gem_version: 7.32
 
 - job:
-    name: puppet-openstack-libraries-litmus-8.11-ubuntu-noble
+    name: puppet-openstack-libraries-litmus-8.10-ubuntu-noble
     parent: puppet-openstack-litmus-libraries-base
     nodeset: ubuntu-noble
     voting: false
     vars:
-      puppet_gem_version: 8.11
+      puppet_gem_version: 8.10
 
 - job:
     name: puppet-openstack-libraries-litmus-latest-ubuntu-noble
@@ -92,9 +92,9 @@
     name: puppet-openstack-litmus-jobs
     check:
       jobs:
-        - puppet-openstack-litmus-7.35-centos-9-stream
-        - puppet-openstack-litmus-8.11-ubuntu-noble
+        - puppet-openstack-litmus-7.32-centos-9-stream
+        - puppet-openstack-litmus-8.10-ubuntu-noble
         - puppet-openstack-litmus-latest-ubuntu-noble
     gate:
       jobs:
-        - puppet-openstack-litmus-7.35-centos-9-stream
+        - puppet-openstack-litmus-7.32-centos-9-stream
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 03dd165ba..a80576166 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -2,18 +2,18 @@
 # This file contains the puppet unit job configurations
 #
 - job:
-    name: puppet-openstack-unit-7.35-centos-9-stream
+    name: puppet-openstack-unit-7.32-centos-9-stream
     parent: puppet-openstack-unit-base
     nodeset: centos-9-stream
     vars:
-      puppet_gem_version: 7.35
+      puppet_gem_version: 7.32
 
 - job:
-    name: puppet-openstack-unit-8.11-ubuntu-noble
+    name: puppet-openstack-unit-8.10-ubuntu-noble
     parent: puppet-openstack-unit-base
     nodeset: ubuntu-noble
     vars:
-      puppet_gem_version: 8.11
+      puppet_gem_version: 8.10
 
 - job:
     name: puppet-openstack-unit-latest-ubuntu-noble
@@ -27,10 +27,10 @@
     name: puppet-openstack-module-unit-jobs
     check:
       jobs:
-        - puppet-openstack-unit-7.35-centos-9-stream
-        - puppet-openstack-unit-8.11-ubuntu-noble
+        - puppet-openstack-unit-7.32-centos-9-stream
+        - puppet-openstack-unit-8.10-ubuntu-noble
         - puppet-openstack-unit-latest-ubuntu-noble
     gate:
       jobs:
-        - puppet-openstack-unit-7.35-centos-9-stream
-        - puppet-openstack-unit-8.11-ubuntu-noble
+        - puppet-openstack-unit-7.32-centos-9-stream
+        - puppet-openstack-unit-8.10-ubuntu-noble