diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 199de5a8d..05bfa6a41 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -34,7 +34,6 @@
         - puppet-openstack-libraries-puppet-unit-7.10-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
         - puppet-openstack-libraries-litmus-6.21-ubuntu-focal
-        - puppet-openstack-libraries-litmus-7.10-centos-8-stream
         - puppet-openstack-libraries-litmus-7.10-centos-9-stream
         - puppet-openstack-libraries-litmus-7.10-ubuntu-focal
         - puppet-openstack-libraries-litmus-latest-ubuntu-focal
@@ -44,7 +43,7 @@
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-7.10-centos-9-stream
-        - puppet-openstack-libraries-litmus-7.10-centos-8-stream
+        - puppet-openstack-libraries-litmus-7.10-centos-9-stream
 
 # integration jobs
 - project-template:
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index c1bb4bace..6d7ae0e25 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -38,18 +38,11 @@
     abstract: true
     run: playbooks/run-libraries-litmus-tests.yaml
 
-- job:
-    name: puppet-openstack-litmus-7.10-centos-8-stream
-    parent: puppet-openstack-litmus-module-base
-    nodeset: centos-8-stream
-    vars:
-      puppet_gem_version: 7.10.0
-      ceph: pacific
-
 - job:
     name: puppet-openstack-litmus-7.10-centos-9-stream
     parent: puppet-openstack-litmus-module-base
     nodeset: centos-9-stream
+    # TODO(tkajinam): Make job voting once bolt supports Ruby >= 3.0
     voting: false
     vars:
       puppet_gem_version: 7.10.0
@@ -82,17 +75,11 @@
       puppet_gem_version: latest
       ceph: pacific
 
-- job:
-    name: puppet-openstack-libraries-litmus-7.10-centos-8-stream
-    parent: puppet-openstack-litmus-libraries-base
-    nodeset: centos-8-stream
-    vars:
-      puppet_gem_version: 7.10.0
-
 - job:
     name: puppet-openstack-libraries-litmus-7.10-centos-9-stream
     parent: puppet-openstack-litmus-libraries-base
     nodeset: centos-9-stream
+    # TODO(tkajinam): Make job voting once bolt supports Ruby >= 3.0
     voting: false
     vars:
       puppet_gem_version: 7.10.0
@@ -126,10 +113,9 @@
     check:
       jobs:
         - puppet-openstack-litmus-6.21-ubuntu-focal
-        - puppet-openstack-litmus-7.10-centos-8-stream
         - puppet-openstack-litmus-7.10-centos-9-stream
         - puppet-openstack-litmus-7.10-ubuntu-focal
         - puppet-openstack-litmus-latest-ubuntu-focal
     gate:
       jobs:
-        - puppet-openstack-litmus-7.10-centos-8-stream
+        - puppet-openstack-litmus-7.10-centos-9-stream