diff --git a/cicd/jenkins/pr-alma-8-x86_64-py3-pytest b/cicd/jenkins/pr-alma-8-x86_64-py3-pytest
deleted file mode 100644
index 1e2a3405e3b..00000000000
--- a/cicd/jenkins/pr-alma-8-x86_64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'alma',
-    distro_version: '8',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-amazon-2-x86_64-py3-pytest b/cicd/jenkins/pr-amazon-2-x86_64-py3-pytest
deleted file mode 100644
index 0aa8a82e024..00000000000
--- a/cicd/jenkins/pr-amazon-2-x86_64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'amazon',
-    distro_version: '2',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 7,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-arch-lts-x86_64-py3-pytest b/cicd/jenkins/pr-arch-lts-x86_64-py3-pytest
deleted file mode 100644
index 14b2612a928..00000000000
--- a/cicd/jenkins/pr-arch-lts-x86_64-py3-pytest
+++ /dev/null
@@ -1,16 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'arch',
-    distro_version: 'lts',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-centos-7-x86_64-py3-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-pytest
deleted file mode 100644
index 89c5cdb666c..00000000000
--- a/cicd/jenkins/pr-centos-7-x86_64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'centos',
-    distro_version: '7',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 8,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest b/cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest
deleted file mode 100644
index 9db75571c74..00000000000
--- a/cicd/jenkins/pr-centos-7-x86_64-py3-tcp-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'centos',
-    distro_version: '7',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-tcp',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 8,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest b/cicd/jenkins/pr-centosstream-9-x86_64-py3-cloud-pytest
similarity index 89%
rename from cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest
rename to cicd/jenkins/pr-centosstream-9-x86_64-py3-cloud-pytest
index 1f67e72a7b8..b041f3b970c 100644
--- a/cicd/jenkins/pr-centos-7-x86_64-py3-cloud-pytest
+++ b/cicd/jenkins/pr-centosstream-9-x86_64-py3-cloud-pytest
@@ -2,8 +2,8 @@
 
 runTestSuite(
     concurrent_builds: 0,  // Don't cancel builds still running. Wait until they end.
-    distro_name: 'centos',
-    distro_version: '7',
+    distro_name: 'centosstream',
+    distro_version: '9',
     distro_arch: 'x86-64',
     env: env,
     jenkins_slave_label: 'kitchen-slave',
diff --git a/cicd/jenkins/pr-centosstream-9-x86_64-py3-pytest b/cicd/jenkins/pr-centosstream-9-x86_64-py3-pytest
deleted file mode 100644
index 34c0c6165cc..00000000000
--- a/cicd/jenkins/pr-centosstream-9-x86_64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'centosstream',
-    distro_version: '9',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-debian-10-amd64-py3-pytest b/cicd/jenkins/pr-debian-10-amd64-py3-pytest
deleted file mode 100644
index 5877da9e5fe..00000000000
--- a/cicd/jenkins/pr-debian-10-amd64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'debian',
-    distro_version: '10',
-    distro_arch: 'amd64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-debian-11-amd64-py3-pytest b/cicd/jenkins/pr-debian-11-amd64-py3-pytest
deleted file mode 100644
index dff5b0d7c4b..00000000000
--- a/cicd/jenkins/pr-debian-11-amd64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'debian',
-    distro_version: '11',
-    distro_arch: 'amd64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-debian-11-arm64-py3-pytest b/cicd/jenkins/pr-debian-11-arm64-py3-pytest
deleted file mode 100644
index 91144f855e9..00000000000
--- a/cicd/jenkins/pr-debian-11-arm64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'debian',
-    distro_version: '11',
-    distro_arch: 'arm64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest b/cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest
deleted file mode 100644
index d998e3bd3ca..00000000000
--- a/cicd/jenkins/pr-macosx-catalina-x86_64-py3-pytest
+++ /dev/null
@@ -1,20 +0,0 @@
-@Library('salt@master-1.11') _
-
-// Pre-nox pipeline
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'macosx',
-    distro_version: 'catalina',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave-mac',
-    kitchen_platforms_file: '/var/jenkins/workspace/pre-golden-platforms-new.3.9.yml',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 10,
-    use_spot_instances: false,
-    macos_python_version: '3.9',
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest b/cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest
deleted file mode 100644
index fc69bc7f941..00000000000
--- a/cicd/jenkins/pr-opensuse-15-x86_64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'opensuse',
-    distro_version: '15',
-    distro_arch: 'x86-64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest b/cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest
deleted file mode 100644
index f299894265a..00000000000
--- a/cicd/jenkins/pr-ubuntu-2004-amd64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'ubuntu',
-    distro_version: '2004',
-    distro_arch: 'amd64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-ubuntu-2004-amd64-py3-tcp-pytest b/cicd/jenkins/pr-ubuntu-2004-amd64-py3-tcp-pytest
deleted file mode 100644
index c99f8aee609..00000000000
--- a/cicd/jenkins/pr-ubuntu-2004-amd64-py3-tcp-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'ubuntu',
-    distro_version: '2004',
-    distro_arch: 'amd64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-tcp',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-ubuntu-2004-arm64-py3-pytest b/cicd/jenkins/pr-ubuntu-2004-arm64-py3-pytest
deleted file mode 100644
index 807ced06fca..00000000000
--- a/cicd/jenkins/pr-ubuntu-2004-arm64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'ubuntu',
-    distro_version: '2004',
-    distro_arch: 'arm64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-ubuntu-2204-amd64-py3-pytest b/cicd/jenkins/pr-ubuntu-2204-amd64-py3-pytest
deleted file mode 100644
index 632aa528730..00000000000
--- a/cicd/jenkins/pr-ubuntu-2204-amd64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'ubuntu',
-    distro_version: '2204',
-    distro_arch: 'amd64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-ubuntu-2204-amd64-py3-tcp-pytest b/cicd/jenkins/pr-ubuntu-2204-amd64-py3-tcp-pytest
deleted file mode 100644
index 50cfa9ce859..00000000000
--- a/cicd/jenkins/pr-ubuntu-2204-amd64-py3-tcp-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'ubuntu',
-    distro_version: '2204',
-    distro_arch: 'amd64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-tcp',
-    nox_passthrough_opts: '--ssh-tests',
-    python_version: 'py3',
-    testrun_timeout: 6,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-windows-2016-x64-py3-pytest b/cicd/jenkins/pr-windows-2016-x64-py3-pytest
deleted file mode 100644
index 8e7b3cb1827..00000000000
--- a/cicd/jenkins/pr-windows-2016-x64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'windows',
-    distro_version: '2016',
-    distro_arch: 'x64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '',
-    python_version: 'py3',
-    testrun_timeout: 9,
-    use_spot_instances: false,
-)
-
-// vim: ft=groovy
diff --git a/cicd/jenkins/pr-windows-2019-x64-py3-pytest b/cicd/jenkins/pr-windows-2019-x64-py3-pytest
deleted file mode 100644
index 509f59b5497..00000000000
--- a/cicd/jenkins/pr-windows-2019-x64-py3-pytest
+++ /dev/null
@@ -1,17 +0,0 @@
-@Library('salt@master-1.11') _
-
-runTestSuite(
-    concurrent_builds: 1,
-    distro_name: 'windows',
-    distro_version: '2019',
-    distro_arch: 'x64',
-    env: env,
-    jenkins_slave_label: 'kitchen-slave',
-    nox_env_name: 'pytest-zeromq',
-    nox_passthrough_opts: '',
-    python_version: 'py3',
-    testrun_timeout: 10,
-    use_spot_instances: true,
-)
-
-// vim: ft=groovy