diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index 7e0013478..eb2d388f4 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -6,6 +6,13 @@
     vars:
       puppet: 6
 
+- job:
+    name: puppet-openstack-integration-7
+    parent: puppet-openstack-integration-run-base
+    abstract: true
+    vars:
+      puppet: 7
+
 - job:
     name: puppet-openstack-integration-6-scenario000
     parent: puppet-openstack-integration-6
@@ -13,12 +20,25 @@
     vars:
       scenario: scenario000
 
+- job:
+    name: puppet-openstack-integration-7-scenario000
+    parent: puppet-openstack-integration-7
+    abstract: true
+    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
+    voting: false
+    nodeset: centos-8-stream
+
 - job:
     name: puppet-openstack-integration-6-scenario001
     parent: puppet-openstack-integration-6
@@ -27,6 +47,14 @@
       scenario: scenario001
       ceph: octopus
 
+- job:
+    name: puppet-openstack-integration-7-scenario001
+    parent: puppet-openstack-integration-7
+    abstract: true
+    vars:
+      scenario: scenario001
+      ceph: octopus
+
 - job:
     name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
     parent: puppet-openstack-integration-6-scenario001
@@ -38,6 +66,11 @@
     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
+    nodeset: centos-8-stream
+
 - job:
     name: puppet-openstack-integration-6-scenario001-tempest-debian-stable-luminous
     parent: puppet-openstack-integration-6-scenario001
@@ -52,6 +85,13 @@
     vars:
       scenario: scenario002
 
+- job:
+    name: puppet-openstack-integration-7-scenario002
+    parent: puppet-openstack-integration-7
+    abstract: true
+    vars:
+      scenario: scenario002
+
 - job:
     name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
     parent: puppet-openstack-integration-6-scenario002
@@ -63,6 +103,11 @@
     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
+    nodeset: centos-8-stream
+
 - job:
     name: puppet-openstack-integration-6-scenario002-tempest-debian-stable
     parent: puppet-openstack-integration-6-scenario002
@@ -77,6 +122,13 @@
     vars:
       scenario: scenario003
 
+- job:
+    name: puppet-openstack-integration-7-scenario003
+    parent: puppet-openstack-integration-7
+    abstract: true
+    vars:
+      scenario: scenario003
+
 - job:
     name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
     parent: puppet-openstack-integration-6-scenario003
@@ -88,6 +140,11 @@
     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
+    nodeset: centos-8-stream
+
 - job:
     name: puppet-openstack-integration-6-scenario003-tempest-debian-stable
     parent: puppet-openstack-integration-6-scenario003
@@ -103,6 +160,14 @@
       scenario: scenario004
       ceph: octopus
 
+- job:
+    name: puppet-openstack-integration-7-scenario004
+    parent: puppet-openstack-integration-7
+    abstract: true
+    vars:
+      scenario: scenario004
+      ceph: octopus
+
 - job:
     name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
     parent: puppet-openstack-integration-6-scenario004
@@ -114,6 +179,11 @@
     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
+    nodeset: centos-8-stream
+
 - job:
     name: puppet-openstack-integration-6-scenario004-tempest-debian-stable-luminous
     parent: puppet-openstack-integration-6-scenario004
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 6bf6ae747..20516f97a 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -9,10 +9,12 @@
       jobs:
         - puppet-openstack-lint-ubuntu-focal
         - puppet-openstack-syntax-6-ubuntu-focal
+        - puppet-openstack-syntax-7-ubuntu-focal
     gate:
       jobs:
         - puppet-openstack-lint-ubuntu-focal
         - puppet-openstack-syntax-6-ubuntu-focal
+        - puppet-openstack-syntax-7-ubuntu-focal
 
 - project:
     templates:
@@ -26,18 +28,24 @@
       jobs:
         - 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-centos-8-stream
-        - puppet-openstack-libraries-litmus-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
+        - puppet-openstack-libraries-litmus-latest-ubuntu-focal
     gate:
       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-6.21-ubuntu-focal
-        - puppet-openstack-libraries-litmus-centos-8-stream
+        - puppet-openstack-libraries-litmus-6.21-centos-8-stream
 
 # integration jobs
 - project-template:
@@ -53,6 +61,11 @@
         - 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
+        - puppet-openstack-integration-7-scenario003-tempest-centos-8-stream
+        - puppet-openstack-integration-7-scenario004-tempest-centos-8-stream
     gate:
       jobs:
         - puppet-openstack-integration-6-scenario001-tempest-centos-8-stream
@@ -72,6 +85,7 @@
       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
@@ -85,6 +99,7 @@
       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
@@ -98,6 +113,7 @@
       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
@@ -111,6 +127,7 @@
       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
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 008589fe6..4a30f846e 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -8,6 +8,13 @@
     vars:
       puppet_gem_version: 6.21.1
 
+- job:
+    name: puppet-openstack-libraries-puppet-unit-7.5-centos-8-stream
+    parent: puppet-openstack-libraries-puppet-unit-base
+    nodeset: centos-8-stream
+    vars:
+      puppet_gem_version: 7.5.0
+
 - job:
     name: puppet-openstack-libraries-puppet-unit-6.21-ubuntu-focal
     parent: puppet-openstack-libraries-puppet-unit-base
@@ -16,6 +23,14 @@
       puppet_gem_version: 6.21.1
       rspec_puppet_version: '= 2.8.0'
 
+- job:
+    name: puppet-openstack-libraries-puppet-unit-7.5-ubuntu-focal
+    parent: puppet-openstack-libraries-puppet-unit-base
+    nodeset: ubuntu-focal
+    vars:
+      puppet_gem_version: 7.5.0
+      rspec_puppet_version: '= 2.8.0'
+
 - job:
     name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
     parent: puppet-openstack-libraries-puppet-unit-base
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 5dae70ecc..0c91eb34f 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -16,6 +16,12 @@
     vars:
       puppet: 6
 
+- job:
+    name: puppet-openstack-syntax-7-ubuntu-focal
+    parent: puppet-openstack-syntax-base
+    vars:
+      puppet: 7
+
 - job:
     name: puppet-openstack-libraries-puppet-lint-ubuntu-focal
     parent: puppet-openstack-integration-base
@@ -49,3 +55,9 @@
     parent: puppet-openstack-libraries-puppet-syntax
     vars:
       puppet: 6
+
+- job:
+    name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-focal
+    parent: puppet-openstack-libraries-puppet-syntax
+    vars:
+      puppet: 7
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index cd2103646..689b4f072 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -38,7 +38,7 @@
     run: playbooks/run-libraries-litmus-tests.yaml
 
 - job:
-    name: puppet-openstack-litmus-centos-8-stream
+    name: puppet-openstack-litmus-6.21-centos-8-stream
     parent: puppet-openstack-litmus-module-base
     nodeset: centos-8-stream
     vars:
@@ -46,7 +46,33 @@
       ceph: octopus
 
 - job:
-    name: puppet-openstack-litmus-ubuntu-focal
+    name: puppet-openstack-litmus-7.5-centos-8-stream
+    parent: puppet-openstack-litmus-module-base
+    nodeset: centos-8-stream
+    vars:
+      puppet_gem_version: 7.5.0
+      ceph: octopus
+
+- job:
+    name: puppet-openstack-litmus-6.21-ubuntu-focal
+    parent: puppet-openstack-litmus-module-base
+    nodeset: ubuntu-focal
+    voting: false
+    vars:
+      puppet_gem_version: 6.21.1
+      ceph: octopus
+
+- job:
+    name: puppet-openstack-litmus-7.5-ubuntu-focal
+    parent: puppet-openstack-litmus-module-base
+    nodeset: ubuntu-focal
+    voting: false
+    vars:
+      puppet_gem_version: 7.5.0
+      ceph: octopus
+
+- job:
+    name: puppet-openstack-litmus-latest-ubuntu-focal
     parent: puppet-openstack-litmus-module-base
     nodeset: ubuntu-focal
     voting: false
@@ -55,14 +81,37 @@
       ceph: octopus
 
 - job:
-    name: puppet-openstack-libraries-litmus-centos-8-stream
+    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-ubuntu-focal
+    name: puppet-openstack-libraries-litmus-7.5-centos-8-stream
+    parent: puppet-openstack-litmus-libraries-base
+    nodeset: centos-8-stream
+    vars:
+      puppet_gem_version: 7.5.0
+
+- job:
+    name: puppet-openstack-libraries-litmus-6.21-ubuntu-focal
+    parent: puppet-openstack-litmus-libraries-base
+    voting: false
+    nodeset: ubuntu-focal
+    vars:
+      puppet_gem_version: 6.21.1
+
+- job:
+    name: puppet-openstack-libraries-litmus-7.5-ubuntu-focal
+    parent: puppet-openstack-litmus-libraries-base
+    voting: false
+    nodeset: ubuntu-focal
+    vars:
+      puppet_gem_version: 7.5.0
+
+- job:
+    name: puppet-openstack-libraries-litmus-latest-ubuntu-focal
     parent: puppet-openstack-litmus-libraries-base
     voting: false
     nodeset: ubuntu-focal
@@ -73,9 +122,12 @@
     name: puppet-openstack-litmus-jobs
     check:
       jobs:
-        - puppet-openstack-litmus-centos-8-stream
-        - puppet-openstack-litmus-ubuntu-focal
+        - 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-centos-8-stream
-        - puppet-openstack-litmus-ubuntu-focal
+        - puppet-openstack-litmus-6.21-centos-8-stream
+        - puppet-openstack-litmus-6.21-ubuntu-focal
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 87944964b..0d3ea3f37 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -8,6 +8,13 @@
     vars:
       puppet_gem_version: 6.21.1
 
+- job:
+    name: puppet-openstack-unit-7.5-centos-8-stream
+    parent: puppet-openstack-unit-base
+    nodeset: centos-8-stream
+    vars:
+      puppet_gem_version: 7.5.0
+
 - job:
     name: puppet-openstack-unit-6.21-ubuntu-focal
     parent: puppet-openstack-unit-base
@@ -16,6 +23,14 @@
       puppet_gem_version: 6.21.1
       rspec_puppet_version: '= 2.8.0'
 
+- job:
+    name: puppet-openstack-unit-7.5-ubuntu-focal
+    parent: puppet-openstack-unit-base
+    nodeset: ubuntu-focal
+    vars:
+      puppet_gem_version: 7.5.0
+      rspec_puppet_version: '= 2.8.0'
+
 - job:
     name: puppet-openstack-unit-latest-ubuntu-focal
     parent: puppet-openstack-unit-base
@@ -30,9 +45,13 @@
     check:
       jobs:
         - puppet-openstack-unit-6.21-centos-8-stream
+        - puppet-openstack-unit-7.5-centos-8-stream
         - puppet-openstack-unit-6.21-ubuntu-focal
+        - puppet-openstack-unit-7.5-ubuntu-focal
         - puppet-openstack-unit-latest-ubuntu-focal
     gate:
       jobs:
         - puppet-openstack-unit-6.21-centos-8-stream
+        - puppet-openstack-unit-7.5-centos-8-stream
         - puppet-openstack-unit-6.21-ubuntu-focal
+        - puppet-openstack-unit-7.5-ubuntu-focal