diff --git a/configure_facts.sh b/configure_facts.sh
index 50b3efcd4..653381b3e 100644
--- a/configure_facts.sh
+++ b/configure_facts.sh
@@ -23,6 +23,7 @@ export DLRN_DEPS_BASE=${DLRN_DEPS_BASE:-${OS_NAME_VERS}-master/deps/latest/}
 export DLRN_BASE_URL=${DLRN_BASE_URL:-${OS_NAME_VERS}-master/puppet-passed-ci/delorean.repo}
 export DLRN_DEPS_URL=${DLRN_DEPS_URL:-${OS_NAME_VERS}-master/delorean-deps.repo}
 export CEPH_VERSION=${CEPH_VERSION:-quincy}
+export ENABLE_CEPH_REPO=${ENABLE_CEPH_REPO:-true}
 
 export SCRIPT_DIR=$(cd `dirname $0` && pwd -P)
 source $SCRIPT_DIR/functions
@@ -68,6 +69,7 @@ export FACTER_ceph_mirror_host=$CEPH_MIRROR_HOST
 export FACTER_ceph_version=$CEPH_VERSION
 export FACTER_delorean_repo_path="/tmp/delorean.repo"
 export FACTER_delorean_deps_repo_path="/tmp/delorean-deps.repo"
+export FACTER_enable_ceph_repo=$ENABLE_CEPH_REPO
 
 MIRROR_FACTS="\
 nodepool_mirror_host=${FACTER_nodepool_mirror_host}
@@ -77,7 +79,8 @@ deps_mirror_host=${FACTER_deps_mirror_host}
 ceph_mirror_host=${FACTER_ceph_mirror_host}
 ceph_version=${FACTER_ceph_version}
 delorean_repo_path=${FACTER_delorean_repo_path}
-delorean_deps_repo_path=${FACTER_delorean_deps_repo_path}"
+delorean_deps_repo_path=${FACTER_delorean_deps_repo_path}
+enable_ceph_repo=${FACTER_enable_ceph_repo}"
 
 if [ "${WRITE_FACTS}" = true ]; then
     $SUDO mkdir -p /etc/facter/facts.d/
diff --git a/manifests/params.pp b/manifests/params.pp
index 798d35d10..8ac50ba3a 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -12,8 +12,8 @@ class openstack_integration::params {
       $ca_bundle_cert_path = '/etc/ssl/certs/puppet_openstack.pem'
       $cert_path           = '/usr/local/share/ca-certificates/puppet_openstack.crt'
       $update_ca_certs_cmd = '/usr/sbin/update-ca-certificates -f'
-      $mysql_charset       = 'utf8'
-      $mysql_collate       = 'utf8_general_ci'
+      $mysql_charset       = 'utf8mb3'
+      $mysql_collate       = 'utf8mb3_general_ci'
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem")
diff --git a/manifests/repos.pp b/manifests/repos.pp
index 58f70de84..4ab3209a3 100644
--- a/manifests/repos.pp
+++ b/manifests/repos.pp
@@ -19,7 +19,7 @@ class openstack_integration::repos {
         'Ubuntu': {
           include apt
           class { 'openstack_extras::repo::debian::ubuntu':
-            release         => 'yoga',
+            release         => 'zed',
             package_require => true,
             uca_location    => pick($::uca_mirror_host, 'http://ubuntu-cloud.archive.canonical.com/ubuntu'),
           }
@@ -27,7 +27,7 @@ class openstack_integration::repos {
         'Debian': {
           include apt
           class { 'openstack_extras::repo::debian::debian':
-            release         => 'yoga',
+            release         => 'zed',
             package_require => true,
           }
         }
diff --git a/playbooks/run-integration-tests.yaml b/playbooks/run-integration-tests.yaml
index 4627e7531..0d269c327 100644
--- a/playbooks/run-integration-tests.yaml
+++ b/playbooks/run-integration-tests.yaml
@@ -5,6 +5,7 @@
           set -ex
           trap "./copy_logs.sh" EXIT
           export CEPH_VERSION={{ ceph }}
+          export ENABLE_CEPH_REPO={{ enable_ceph_repo | default(true) }}
           export PUPPET_MAJ_VERSION={{ puppet }}
           export SCENARIO={{ scenario }}
           export GEM_HOME=`pwd`/.bundled_gems
diff --git a/playbooks/run-libraries-litmus-tests.yaml b/playbooks/run-libraries-litmus-tests.yaml
index 3f55f5ff6..c62ea1741 100644
--- a/playbooks/run-libraries-litmus-tests.yaml
+++ b/playbooks/run-libraries-litmus-tests.yaml
@@ -5,6 +5,8 @@
           set -e
           set -x
           trap "{{ ansible_user_dir }}/workspace/puppet-openstack-integration/copy_logs.sh" EXIT
+          export CEPH_VERSION={{ ceph }}
+          export ENABLE_CEPH_REPO={{ enable_ceph_repo | default(true) }}
           if [ "{{ puppet_gem_version }}" != "latest" ]; then
             export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
           fi
diff --git a/playbooks/run-litmus-tests.yaml b/playbooks/run-litmus-tests.yaml
index 0d6181c78..87fcb3afc 100644
--- a/playbooks/run-litmus-tests.yaml
+++ b/playbooks/run-litmus-tests.yaml
@@ -12,6 +12,7 @@
           }
           trap trap_exit_sig EXIT
           export CEPH_VERSION={{ ceph }}
+          export ENABLE_CEPH_REPO={{ enable_ceph_repo | default(true) }}
           if [ "{{ puppet_gem_version }}" != "latest" ]; then
             export PUPPET_GEM_VERSION='~> {{ puppet_gem_version }}'
           fi
diff --git a/zuul.d/base.yaml b/zuul.d/base.yaml
index 8275bd6c4..e36faccb6 100644
--- a/zuul.d/base.yaml
+++ b/zuul.d/base.yaml
@@ -83,9 +83,9 @@
     name: puppet-openstack-base
     pre-run: playbooks/prepare-node-common.yaml
     abstract: true
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     vars:
-      puppet: 6
+      puppet: 7
       use_puppetlabs: false
 
 - job:
@@ -138,7 +138,7 @@
       - ^setup.py$
       - ^tox.ini$
     vars:
-      rspec_puppet_version: '~> 2.8.0'
+      rspec_puppet_version: '~> 2.10.0'
 
 - job:
     name: puppet-openstack-libraries-puppet-unit-base
@@ -164,4 +164,4 @@
       - ^setup.py$
       - ^tox.ini$
     vars:
-      rspec_puppet_version: '~> 2.8.0'
+      rspec_puppet_version: '~> 2.10.0'
diff --git a/zuul.d/integration.yaml b/zuul.d/integration.yaml
index cf33aef74..8cdd41fd1 100644
--- a/zuul.d/integration.yaml
+++ b/zuul.d/integration.yaml
@@ -1,11 +1,4 @@
 ---
-- job:
-    name: puppet-openstack-integration-6
-    parent: puppet-openstack-integration-run-base
-    abstract: true
-    vars:
-      puppet: 6
-
 - job:
     name: puppet-openstack-integration-7
     parent: puppet-openstack-integration-run-base
@@ -13,13 +6,6 @@
     vars:
       puppet: 7
 
-- job:
-    name: puppet-openstack-integration-6-scenario000
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario000
-
 - job:
     name: puppet-openstack-integration-7-scenario000
     parent: puppet-openstack-integration-7
@@ -35,13 +21,6 @@
       nodes:
         - name: centos-9-stream
           label: centos-9-stream
-- job:
-    name: puppet-openstack-integration-6-scenario001
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario001
-      ceph: quincy
 
 - job:
     name: puppet-openstack-integration-7-scenario001
@@ -52,10 +31,12 @@
       ceph: quincy
 
 - job:
-    name: puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
-    parent: puppet-openstack-integration-6-scenario001
-    nodeset: ubuntu-focal
+    name: puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
+    parent: puppet-openstack-integration-7-scenario001
+    nodeset: ubuntu-jammy
     voting: false
+    vars:
+      enable_ceph_repo: false
 
 - job:
     name: puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
@@ -65,13 +46,6 @@
         - name: centos-9-stream
           label: centos-9-stream
 
-- job:
-    name: puppet-openstack-integration-6-scenario002
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario002
-
 - job:
     name: puppet-openstack-integration-7-scenario002
     parent: puppet-openstack-integration-7
@@ -80,10 +54,12 @@
       scenario: scenario002
 
 - job:
-    name: puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
-    parent: puppet-openstack-integration-6-scenario002
-    nodeset: ubuntu-focal
+    name: puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
+    parent: puppet-openstack-integration-7-scenario002
+    nodeset: ubuntu-jammy
     voting: false
+    vars:
+      enable_ceph_repo: false
 
 - job:
     name: puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
@@ -93,13 +69,6 @@
         - name: centos-9-stream
           label: centos-9-stream
 
-- job:
-    name: puppet-openstack-integration-6-scenario003
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario003
-
 - job:
     name: puppet-openstack-integration-7-scenario003
     parent: puppet-openstack-integration-7
@@ -108,10 +77,12 @@
       scenario: scenario003
 
 - job:
-    name: puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
-    parent: puppet-openstack-integration-6-scenario003
-    nodeset: ubuntu-focal
+    name: puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
+    parent: puppet-openstack-integration-7-scenario003
+    nodeset: ubuntu-jammy
     voting: false
+    vars:
+      enable_ceph_repo: false
 
 - job:
     name: puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
@@ -121,14 +92,6 @@
         - name: centos-9-stream
           label: centos-9-stream
 
-- job:
-    name: puppet-openstack-integration-6-scenario004
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario004
-      ceph: quincy
-
 - job:
     name: puppet-openstack-integration-7-scenario004
     parent: puppet-openstack-integration-7
@@ -138,10 +101,12 @@
       ceph: quincy
 
 - job:
-    name: puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
-    parent: puppet-openstack-integration-6-scenario004
-    nodeset: ubuntu-focal
+    name: puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
+    parent: puppet-openstack-integration-7-scenario004
+    nodeset: ubuntu-jammy
     voting: false
+    vars:
+      enable_ceph_repo: false
 
 - job:
     name: puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
@@ -151,14 +116,6 @@
         - name: centos-9-stream
           label: centos-9-stream
 
-- job:
-    name: puppet-openstack-integration-6-scenario005
-    parent: puppet-openstack-integration-6
-    abstract: true
-    vars:
-      scenario: scenario005
-      ceph: quincy
-
 - job:
     name: puppet-openstack-integration-7-scenario005
     parent: puppet-openstack-integration-7
@@ -168,10 +125,12 @@
       ceph: quincy
 
 - job:
-    name: puppet-openstack-integration-6-scenario005-tempest-ubuntu-focal
-    parent: puppet-openstack-integration-6-scenario005
-    nodeset: ubuntu-focal
+    name: puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
+    parent: puppet-openstack-integration-7-scenario005
+    nodeset: ubuntu-jammy
     voting: false
+    vars:
+      enable_ceph_repo: false
 
 - job:
     name: puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
diff --git a/zuul.d/layout.yaml b/zuul.d/layout.yaml
index 7c9cd7e1f..91c8bc709 100644
--- a/zuul.d/layout.yaml
+++ b/zuul.d/layout.yaml
@@ -7,14 +7,12 @@
     name: puppet-openstack-check-jobs
     check:
       jobs:
-        - puppet-openstack-lint-ubuntu-focal
-        - puppet-openstack-syntax-6-ubuntu-focal
-        - puppet-openstack-syntax-7-ubuntu-focal
+        - puppet-openstack-lint-ubuntu-jammy
+        - puppet-openstack-syntax-7-ubuntu-jammy
     gate:
       jobs:
-        - puppet-openstack-lint-ubuntu-focal
-        - puppet-openstack-syntax-6-ubuntu-focal
-        - puppet-openstack-syntax-7-ubuntu-focal
+        - puppet-openstack-lint-ubuntu-jammy
+        - puppet-openstack-syntax-7-ubuntu-jammy
 
 - project:
     templates:
@@ -26,24 +24,20 @@
     name: puppet-openstack-library-jobs
     check:
       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.28-ubuntu-focal
+        - puppet-openstack-libraries-puppet-lint-ubuntu-jammy
+        - puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
         - 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.28-ubuntu-focal
+        - puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy
+        - puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy
         - puppet-openstack-libraries-litmus-7.16-centos-9-stream
-        - puppet-openstack-libraries-litmus-7.16-ubuntu-focal
-        - puppet-openstack-libraries-litmus-latest-ubuntu-focal
+        - puppet-openstack-libraries-litmus-7.16-ubuntu-jammy
+        - puppet-openstack-libraries-litmus-latest-ubuntu-jammy
     gate:
       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.28-ubuntu-focal
+        - puppet-openstack-libraries-puppet-lint-ubuntu-jammy
+        - puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
         - puppet-openstack-libraries-puppet-unit-7.16-centos-9-stream
+        - puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy
         - puppet-openstack-libraries-litmus-7.16-centos-9-stream
 
 # integration jobs
@@ -51,11 +45,11 @@
     name: puppet-openstack-integration-jobs-all
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
-        - 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-scenario005-tempest-ubuntu-focal
+        - puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
+        - puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
+        - puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
+        - puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
+        - puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario000-tempest-centos-9-stream
         - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
         - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
@@ -74,7 +68,7 @@
     name: puppet-openstack-integration-jobs-scenario001
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario001-tempest-ubuntu-focal
+        - puppet-openstack-integration-7-scenario001-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario001-tempest-centos-9-stream
     gate:
       jobs:
@@ -84,7 +78,7 @@
     name: puppet-openstack-integration-jobs-scenario002
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario002-tempest-ubuntu-focal
+        - puppet-openstack-integration-7-scenario002-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario002-tempest-centos-9-stream
     gate:
       jobs:
@@ -94,7 +88,7 @@
     name: puppet-openstack-integration-jobs-scenario003
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario003-tempest-ubuntu-focal
+        - puppet-openstack-integration-7-scenario003-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario003-tempest-centos-9-stream
     gate:
       jobs:
@@ -104,7 +98,7 @@
     name: puppet-openstack-integration-jobs-scenario004
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario004-tempest-ubuntu-focal
+        - puppet-openstack-integration-7-scenario004-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario004-tempest-centos-9-stream
     gate:
       jobs:
@@ -114,7 +108,7 @@
     name: puppet-openstack-integration-jobs-scenario005
     check:
       jobs:
-        - puppet-openstack-integration-6-scenario005-tempest-ubuntu-focal
+        - puppet-openstack-integration-7-scenario005-tempest-ubuntu-jammy
         - puppet-openstack-integration-7-scenario005-tempest-centos-9-stream
     gate:
       jobs:
diff --git a/zuul.d/libraries.yaml b/zuul.d/libraries.yaml
index 6e7f266ce..4cf920312 100644
--- a/zuul.d/libraries.yaml
+++ b/zuul.d/libraries.yaml
@@ -8,29 +8,23 @@
     vars:
       puppet_gem_version: 7.16.0
       # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
-      rspec_puppet_version: '= 2.10.0'
+      rspec_puppet_version: '~> 2.10.0'
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-6.28-ubuntu-focal
+    name: puppet-openstack-libraries-puppet-unit-7.16-ubuntu-jammy
     parent: puppet-openstack-libraries-puppet-unit-base
-    nodeset: ubuntu-focal
-    vars:
-      puppet_gem_version: 6.28.0
-      rspec_puppet_version: '= 2.9.0'
-
-- job:
-    name: puppet-openstack-libraries-puppet-unit-7.16-ubuntu-focal
-    parent: puppet-openstack-libraries-puppet-unit-base
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     vars:
       puppet_gem_version: 7.16.0
-      rspec_puppet_version: '= 2.9.0'
+      # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
+      rspec_puppet_version: '~> 2.10.0'
 
 - job:
-    name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-focal
+    name: puppet-openstack-libraries-puppet-unit-latest-ubuntu-jammy
     parent: puppet-openstack-libraries-puppet-unit-base
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     voting: false
     vars:
       puppet_gem_version: latest
-      rspec_puppet_version: '= 2.9.0'
+      # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
+      rspec_puppet_version: '~> 2.10.0'
diff --git a/zuul.d/linters.yaml b/zuul.d/linters.yaml
index 0c91eb34f..b521625a2 100644
--- a/zuul.d/linters.yaml
+++ b/zuul.d/linters.yaml
@@ -1,6 +1,6 @@
 ---
 - job:
-    name: puppet-openstack-lint-ubuntu-focal
+    name: puppet-openstack-lint-ubuntu-jammy
     parent: puppet-openstack-module-base
     run: playbooks/run-lint-tests.yaml
     irrelevant-files:
@@ -11,19 +11,13 @@
       - ^test-requirements.txt$
 
 - job:
-    name: puppet-openstack-syntax-6-ubuntu-focal
-    parent: puppet-openstack-syntax-base
-    vars:
-      puppet: 6
-
-- job:
-    name: puppet-openstack-syntax-7-ubuntu-focal
+    name: puppet-openstack-syntax-7-ubuntu-jammy
     parent: puppet-openstack-syntax-base
     vars:
       puppet: 7
 
 - job:
-    name: puppet-openstack-libraries-puppet-lint-ubuntu-focal
+    name: puppet-openstack-libraries-puppet-lint-ubuntu-jammy
     parent: puppet-openstack-integration-base
     run: playbooks/run-libraries-lint-tests.yaml
     pre-run: playbooks/prepare-node-unit.yaml
@@ -51,13 +45,7 @@
       - ^tox.ini$
 
 - job:
-    name: puppet-openstack-libraries-puppet-syntax-6-ubuntu-focal
-    parent: puppet-openstack-libraries-puppet-syntax
-    vars:
-      puppet: 6
-
-- job:
-    name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-focal
+    name: puppet-openstack-libraries-puppet-syntax-7-ubuntu-jammy
     parent: puppet-openstack-libraries-puppet-syntax
     vars:
       puppet: 7
diff --git a/zuul.d/litmus.yaml b/zuul.d/litmus.yaml
index 7f29bdd3b..86eeb8026 100644
--- a/zuul.d/litmus.yaml
+++ b/zuul.d/litmus.yaml
@@ -47,31 +47,24 @@
       ceph: quincy
 
 - job:
-    name: puppet-openstack-litmus-6.28-ubuntu-focal
+    name: puppet-openstack-litmus-7.16-ubuntu-jammy
     parent: puppet-openstack-litmus-module-base
-    nodeset: ubuntu-focal
-    voting: false
-    vars:
-      puppet_gem_version: 6.28.0
-      ceph: quincy
-
-- job:
-    name: puppet-openstack-litmus-7.16-ubuntu-focal
-    parent: puppet-openstack-litmus-module-base
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     voting: false
     vars:
       puppet_gem_version: 7.16.0
       ceph: quincy
+      enable_ceph_repo: false
 
 - job:
-    name: puppet-openstack-litmus-latest-ubuntu-focal
+    name: puppet-openstack-litmus-latest-ubuntu-jammy
     parent: puppet-openstack-litmus-module-base
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     voting: false
     vars:
       puppet_gem_version: latest
       ceph: quincy
+      enable_ceph_repo: false
 
 - job:
     name: puppet-openstack-libraries-litmus-7.16-centos-9-stream
@@ -81,37 +74,30 @@
       puppet_gem_version: 7.16.0
 
 - job:
-    name: puppet-openstack-libraries-litmus-6.28-ubuntu-focal
+    name: puppet-openstack-libraries-litmus-7.16-ubuntu-jammy
     parent: puppet-openstack-litmus-libraries-base
     voting: false
-    nodeset: ubuntu-focal
-    vars:
-      puppet_gem_version: 6.28.0
-
-- job:
-    name: puppet-openstack-libraries-litmus-7.16-ubuntu-focal
-    parent: puppet-openstack-litmus-libraries-base
-    voting: false
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     vars:
       puppet_gem_version: 7.16.0
+      enable_ceph_repo: false
 
 - job:
-    name: puppet-openstack-libraries-litmus-latest-ubuntu-focal
+    name: puppet-openstack-libraries-litmus-latest-ubuntu-jammy
     parent: puppet-openstack-litmus-libraries-base
     voting: false
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     vars:
       puppet_gem_version: latest
+      enable_ceph_repo: false
 
 - project-template:
     name: puppet-openstack-litmus-jobs
     check:
       jobs:
-        - 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
+        - puppet-openstack-litmus-7.16-ubuntu-jammy
+        - puppet-openstack-litmus-latest-ubuntu-jammy
     gate:
       jobs:
         - puppet-openstack-litmus-7.16-centos-9-stream
diff --git a/zuul.d/unit.yaml b/zuul.d/unit.yaml
index 8fe95f3ce..addb52576 100644
--- a/zuul.d/unit.yaml
+++ b/zuul.d/unit.yaml
@@ -8,43 +8,35 @@
     vars:
       puppet_gem_version: 7.16.0
       # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
-      rspec_puppet_version: '= 2.10.0'
+      rspec_puppet_version: '~> 2.10.0'
 
 - job:
-    name: puppet-openstack-unit-6.28-ubuntu-focal
+    name: puppet-openstack-unit-7.16-ubuntu-jammy
     parent: puppet-openstack-unit-base
-    nodeset: ubuntu-focal
-    vars:
-      puppet_gem_version: 6.28.0
-      rspec_puppet_version: '= 2.9.0'
-
-- job:
-    name: puppet-openstack-unit-7.16-ubuntu-focal
-    parent: puppet-openstack-unit-base
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     vars:
       puppet_gem_version: 7.16.0
-      rspec_puppet_version: '= 2.9.0'
+      # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
+      rspec_puppet_version: '~> 2.10.0'
 
 - job:
-    name: puppet-openstack-unit-latest-ubuntu-focal
+    name: puppet-openstack-unit-latest-ubuntu-jammy
     parent: puppet-openstack-unit-base
-    nodeset: ubuntu-focal
+    nodeset: ubuntu-jammy
     voting: false
     vars:
       puppet_gem_version: latest
-      rspec_puppet_version: '= 2.9.0'
+      # NOTE(tkajinam): rspec-puppet >= 2.10.0 is required for Ruby 3 support
+      rspec_puppet_version: '~> 2.10.0'
 
 - project-template:
     name: puppet-openstack-module-unit-jobs
     check:
       jobs:
         - puppet-openstack-unit-7.16-centos-9-stream
-        - puppet-openstack-unit-6.28-ubuntu-focal
-        - puppet-openstack-unit-7.16-ubuntu-focal
-        - puppet-openstack-unit-latest-ubuntu-focal
+        - puppet-openstack-unit-7.16-ubuntu-jammy
+        - puppet-openstack-unit-latest-ubuntu-jammy
     gate:
       jobs:
         - puppet-openstack-unit-7.16-centos-9-stream
-        - puppet-openstack-unit-6.28-ubuntu-focal
-        - puppet-openstack-unit-7.16-ubuntu-focal
+        - puppet-openstack-unit-7.16-ubuntu-jammy