diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 9a856573c..7c9cd7e1f 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -29,11 +29,11 @@
         - puppet-openstack-libraries-puppet-lint-ubuntu-focal
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
         - puppet-openstack-libraries-puppet-syntax-7-ubuntu-focal
-        - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
+        - puppet-openstack-libraries-puppet-unit-6.28-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-7.16-centos-9-stream
         - puppet-openstack-libraries-puppet-unit-7.16-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
-        - puppet-openstack-libraries-litmus-6.21-ubuntu-focal
+        - puppet-openstack-libraries-litmus-6.28-ubuntu-focal
         - puppet-openstack-libraries-litmus-7.16-centos-9-stream
         - puppet-openstack-libraries-litmus-7.16-ubuntu-focal
         - puppet-openstack-libraries-litmus-latest-ubuntu-focal
@@ -42,7 +42,7 @@
         - puppet-openstack-libraries-puppet-lint-ubuntu-focal
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
         - puppet-openstack-libraries-puppet-syntax-7-ubuntu-focal
-        - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
+        - puppet-openstack-libraries-puppet-unit-6.28-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-7.16-centos-9-stream
         - puppet-openstack-libraries-litmus-7.16-centos-9-stream
 
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index d5c8578b7..6e7f266ce 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -11,11 +11,11 @@
       rspec_puppet_version: '= 2.10.0'
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
+    name: puppet-openstack-libraries-puppet-unit-6.28-ubuntu-focal
     parent: puppet-openstack-libraries-puppet-unit-base
     nodeset: ubuntu-focal
     vars:
-      puppet_gem_version: 6.21.1
+      puppet_gem_version: 6.28.0
       rspec_puppet_version: '= 2.9.0'
 
 - job:
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index 65c645eee..d5f916ac2 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -47,12 +47,12 @@
       ceph: pacific
 
 - job:
-    name: puppet-openstack-litmus-6.21-ubuntu-focal
+    name: puppet-openstack-litmus-6.28-ubuntu-focal
     parent: puppet-openstack-litmus-module-base
     nodeset: ubuntu-focal
     voting: false
     vars:
-      puppet_gem_version: 6.21.1
+      puppet_gem_version: 6.28.0
       ceph: pacific
 
 - job:
@@ -81,12 +81,12 @@
       puppet_gem_version: 7.16.0
 
 - job:
-    name: puppet-openstack-libraries-litmus-6.21-ubuntu-focal
+    name: puppet-openstack-libraries-litmus-6.28-ubuntu-focal
     parent: puppet-openstack-litmus-libraries-base
     voting: false
     nodeset: ubuntu-focal
     vars:
-      puppet_gem_version: 6.21.1
+      puppet_gem_version: 6.28.0
 
 - job:
     name: puppet-openstack-libraries-litmus-7.16-ubuntu-focal
@@ -108,7 +108,7 @@
     name: puppet-openstack-litmus-jobs
     check:
       jobs:
-        - puppet-openstack-litmus-6.21-ubuntu-focal
+        - puppet-openstack-litmus-6.28-ubuntu-focal
         - puppet-openstack-litmus-7.16-centos-9-stream
         - puppet-openstack-litmus-7.16-ubuntu-focal
         - puppet-openstack-litmus-latest-ubuntu-focal
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 48184a882..8fe95f3ce 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -11,11 +11,11 @@
       rspec_puppet_version: '= 2.10.0'
 
 - job:
-    name: puppet-openstack-unit-6.21-ubuntu-focal
+    name: puppet-openstack-unit-6.28-ubuntu-focal
     parent: puppet-openstack-unit-base
     nodeset: ubuntu-focal
     vars:
-      puppet_gem_version: 6.21.1
+      puppet_gem_version: 6.28.0
       rspec_puppet_version: '= 2.9.0'
 
 - job:
@@ -40,11 +40,11 @@
     check:
       jobs:
         - puppet-openstack-unit-7.16-centos-9-stream
-        - puppet-openstack-unit-6.21-ubuntu-focal
+        - puppet-openstack-unit-6.28-ubuntu-focal
         - puppet-openstack-unit-7.16-ubuntu-focal
         - puppet-openstack-unit-latest-ubuntu-focal
     gate:
       jobs:
         - puppet-openstack-unit-7.16-centos-9-stream
-        - puppet-openstack-unit-6.21-ubuntu-focal
+        - puppet-openstack-unit-6.28-ubuntu-focal
         - puppet-openstack-unit-7.16-ubuntu-focal