diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 0fb6d2561..6bce4da42 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -27,12 +27,6 @@
     vars:
       scenario: scenario000
 
-- job:
-    name: puppet-openstack-integration-6-scenario000-tempest-centos-8-stream
-    parent: puppet-openstack-integration-6-scenario000
-    voting: false
-    nodeset: centos-8-stream
-
 - job:
     name: puppet-openstack-integration-7-scenario000-tempest-centos-8-stream
     parent: puppet-openstack-integration-7-scenario000
@@ -61,11 +55,6 @@
     nodeset: ubuntu-focal
     voting: false
 
-- job:
-    name: puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
-    parent: puppet-openstack-integration-6-scenario001
-    nodeset: centos-8-stream
-
 - job:
     name: puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
     parent: puppet-openstack-integration-7-scenario001
@@ -91,11 +80,6 @@
     nodeset: ubuntu-focal
     voting: false
 
-- job:
-    name: puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
-    parent: puppet-openstack-integration-6-scenario002
-    nodeset: centos-8-stream
-
 - job:
     name: puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
     parent: puppet-openstack-integration-7-scenario002
@@ -121,11 +105,6 @@
     nodeset: ubuntu-focal
     voting: false
 
-- job:
-    name: puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
-    parent: puppet-openstack-integration-6-scenario003
-    nodeset: centos-8-stream
-
 - job:
     name: puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
     parent: puppet-openstack-integration-7-scenario003
@@ -153,11 +132,6 @@
     nodeset: ubuntu-focal
     voting: false
 
-- job:
-    name: puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
-    parent: puppet-openstack-integration-6-scenario004
-    nodeset: centos-8-stream
-
 - job:
     name: puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
     parent: puppet-openstack-integration-7-scenario004
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index a78759620..62788ff1e 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -29,12 +29,10 @@
         - 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-centos-8-stream
         - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-7.5-centos-8-stream
         - puppet-openstack-libraries-puppet-unit-7.5-ubuntu-focal
         - puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
-        - puppet-openstack-libraries-litmus-6.21-centos-8-stream
         - puppet-openstack-libraries-litmus-6.21-ubuntu-focal
         - puppet-openstack-libraries-litmus-7.5-centos-8-stream
         - puppet-openstack-libraries-litmus-7.5-ubuntu-focal
@@ -43,9 +41,9 @@
       jobs:
         - puppet-openstack-libraries-puppet-lint-ubuntu-focal
         - puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
-        - puppet-openstack-libraries-puppet-unit-6.21-centos-8-stream
+        - puppet-openstack-libraries-puppet-unit-7.5-centos-8-stream
         - puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
-        - puppet-openstack-libraries-litmus-6.21-centos-8-stream
+        - puppet-openstack-libraries-litmus-7.5-centos-8-stream
 
 # integration jobs
 - project-template:
@@ -56,11 +54,6 @@
         - puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
         - puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
         - puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
-        - puppet-openstack-integration-6-scenario000-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario000-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
@@ -68,51 +61,47 @@
         - puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
     gate:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
         - puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
     gate:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario001-tempest-centos-8-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario002
     check:
       jobs:
         - puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
     gate:
       jobs:
-        - puppet-openstack-integration-6-scenario002-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario002-tempest-centos-8-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario003
     check:
       jobs:
         - puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
     gate:
       jobs:
-        - puppet-openstack-integration-6-scenario003-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
 
 - project-template:
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
         - puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
         - puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
     gate:
       jobs:
-        - puppet-openstack-integration-6-scenario004-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index fd8a12b26..866959936 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -38,14 +38,6 @@
     abstract: true
     run: playbooks/run-libraries-litmus-tests.yaml
 
-- job:
-    name: puppet-openstack-litmus-6.21-centos-8-stream
-    parent: puppet-openstack-litmus-module-base
-    nodeset: centos-8-stream
-    vars:
-      puppet_gem_version: 6.21.1
-      ceph: octopus
-
 - job:
     name: puppet-openstack-litmus-7.5-centos-8-stream
     parent: puppet-openstack-litmus-module-base
@@ -81,13 +73,6 @@
       puppet_gem_version: latest
       ceph: octopus
 
-- job:
-    name: puppet-openstack-libraries-litmus-6.21-centos-8-stream
-    parent: puppet-openstack-litmus-libraries-base
-    nodeset: centos-8-stream
-    vars:
-      puppet_gem_version: 6.21.1
-
 - job:
     name: puppet-openstack-libraries-litmus-7.5-centos-8-stream
     parent: puppet-openstack-litmus-libraries-base
@@ -123,12 +108,11 @@
     name: puppet-openstack-litmus-jobs
     check:
       jobs:
-        - puppet-openstack-litmus-6.21-centos-8-stream
         - puppet-openstack-litmus-6.21-ubuntu-focal
         - puppet-openstack-litmus-7.5-centos-8-stream
         - puppet-openstack-litmus-7.5-ubuntu-focal
         - puppet-openstack-litmus-latest-ubuntu-focal
     gate:
       jobs:
-        - puppet-openstack-litmus-6.21-centos-8-stream
+        - puppet-openstack-litmus-7.5-centos-8-stream
         - puppet-openstack-litmus-6.21-ubuntu-focal