diff --git a/.zuul.yaml b/.zuul.yaml
index 622328ca2..201ecabf6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -95,9 +95,9 @@
       - name: openstack/puppet-zaqar
         override-checkout: stable/queens
       - name: openstack/tempest
-        override-checkout: stable/queens
+        override-checkout: 22.1.0
       - name: openstack/tempest-horizon
-        override-checkout: stable/queens
+        override-checkout: 0.2.0
 
 - job:
     name: puppet-openstack-integration-run-base
diff --git a/Gemfile b/Gemfile
index eda1b7175..fb4e467c0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -7,7 +7,7 @@ group :development, :test, :system_tests do
         :require => 'false'
   else
     gem 'puppet-openstack_spec_helper',
-        :git => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
+        :git => 'https://opendev.org/openstack/puppet-openstack_spec_helper',
         :ref     => 'stable/queens',
         :require => 'false'
   end
diff --git a/Puppetfile b/Puppetfile
index c74ccb6a1..2b2e7c815 100644
--- a/Puppetfile
+++ b/Puppetfile
@@ -2,151 +2,151 @@
 
 ## OpenStack modules
 mod 'aodh',
-  :git => 'https://git.openstack.org/openstack/puppet-aodh',
+  :git => 'https://opendev.org/openstack/puppet-aodh',
   :ref => 'stable/queens'
 
 mod 'barbican',
-  :git => 'https://git.openstack.org/openstack/puppet-barbican',
+  :git => 'https://opendev.org/openstack/puppet-barbican',
   :ref => 'stable/queens'
 
 mod 'ceilometer',
-  :git => 'https://git.openstack.org/openstack/puppet-ceilometer',
+  :git => 'https://opendev.org/openstack/puppet-ceilometer',
   :ref => 'stable/queens'
 
 mod 'ceph',
-  :git => 'https://git.openstack.org/openstack/puppet-ceph',
+  :git => 'https://opendev.org/openstack/puppet-ceph',
   :ref => 'stable/luminous'
 
 mod 'cinder',
-  :git => 'https://git.openstack.org/openstack/puppet-cinder',
+  :git => 'https://opendev.org/openstack/puppet-cinder',
   :ref => 'stable/queens'
 
 mod 'cloudkitty',
-  :git => 'https://git.openstack.org/openstack/puppet-cloudkitty',
+  :git => 'https://opendev.org/openstack/puppet-cloudkitty',
   :ref => 'stable/queens'
 
 mod 'congress',
-  :git => 'https://git.openstack.org/openstack/puppet-congress',
+  :git => 'https://opendev.org/openstack/puppet-congress',
   :ref => 'stable/queens'
 
 mod 'designate',
-  :git => 'https://git.openstack.org/openstack/puppet-designate',
+  :git => 'https://opendev.org/openstack/puppet-designate',
   :ref => 'stable/queens'
 
 mod 'ec2api',
-  :git => 'https://git.openstack.org/openstack/puppet-ec2api',
+  :git => 'https://opendev.org/openstack/puppet-ec2api',
   :ref => 'stable/queens'
 
 mod 'glance',
-  :git => 'https://git.openstack.org/openstack/puppet-glance',
+  :git => 'https://opendev.org/openstack/puppet-glance',
   :ref => 'stable/queens'
 
 mod 'gnocchi',
-  :git => 'https://git.openstack.org/openstack/puppet-gnocchi',
+  :git => 'https://opendev.org/openstack/puppet-gnocchi',
   :ref => 'stable/queens'
 
 mod 'heat',
-  :git => 'https://git.openstack.org/openstack/puppet-heat',
+  :git => 'https://opendev.org/openstack/puppet-heat',
   :ref => 'stable/queens'
 
 mod 'horizon',
-  :git => 'https://git.openstack.org/openstack/puppet-horizon',
+  :git => 'https://opendev.org/openstack/puppet-horizon',
   :ref => 'stable/queens'
 
 mod 'ironic',
-  :git => 'https://git.openstack.org/openstack/puppet-ironic',
+  :git => 'https://opendev.org/openstack/puppet-ironic',
   :ref => 'stable/queens'
 
 mod 'keystone',
-  :git => 'https://git.openstack.org/openstack/puppet-keystone',
+  :git => 'https://opendev.org/openstack/puppet-keystone',
   :ref => 'stable/queens'
 
 mod 'manila',
-  :git => 'https://git.openstack.org/openstack/puppet-manila',
+  :git => 'https://opendev.org/openstack/puppet-manila',
   :ref => 'stable/queens'
 
 mod 'mistral',
-  :git => 'https://git.openstack.org/openstack/puppet-mistral',
+  :git => 'https://opendev.org/openstack/puppet-mistral',
   :ref => 'stable/queens'
 
 mod 'monasca',
-  :git => 'https://git.openstack.org/openstack/puppet-monasca',
+  :git => 'https://opendev.org/openstack/puppet-monasca',
   :ref => 'stable/queens'
 
 mod 'murano',
-  :git => 'https://git.openstack.org/openstack/puppet-murano',
+  :git => 'https://opendev.org/openstack/puppet-murano',
   :ref => 'stable/queens'
 
 mod 'neutron',
-  :git => 'https://git.openstack.org/openstack/puppet-neutron',
+  :git => 'https://opendev.org/openstack/puppet-neutron',
   :ref => 'stable/queens'
 
 mod 'nova',
-  :git => 'https://git.openstack.org/openstack/puppet-nova',
+  :git => 'https://opendev.org/openstack/puppet-nova',
   :ref => 'stable/queens'
 
 mod 'octavia',
-  :git => 'https://git.openstack.org/openstack/puppet-octavia',
+  :git => 'https://opendev.org/openstack/puppet-octavia',
   :ref => 'stable/queens'
 
 mod 'openstack_extras',
-  :git => 'https://git.openstack.org/openstack/puppet-openstack_extras',
+  :git => 'https://opendev.org/openstack/puppet-openstack_extras',
   :ref => 'stable/queens'
 
 mod 'openstacklib',
-  :git => 'https://git.openstack.org/openstack/puppet-openstacklib',
+  :git => 'https://opendev.org/openstack/puppet-openstacklib',
   :ref => 'stable/queens'
 
 mod 'oslo',
-  :git => 'https://git.openstack.org/openstack/puppet-oslo',
+  :git => 'https://opendev.org/openstack/puppet-oslo',
   :ref => 'stable/queens'
 
 mod 'ovn',
-  :git => 'https://git.openstack.org/openstack/puppet-ovn',
+  :git => 'https://opendev.org/openstack/puppet-ovn',
   :ref => 'stable/queens'
 
 mod 'panko',
-  :git => 'https://git.openstack.org/openstack/puppet-panko',
+  :git => 'https://opendev.org/openstack/puppet-panko',
   :ref => 'stable/queens'
 
 mod 'qdr',
-  :git => 'https://git.openstack.org/openstack/puppet-qdr',
+  :git => 'https://opendev.org/openstack/puppet-qdr',
   :ref => 'stable/queens'
 
 mod 'sahara',
-  :git => 'https://git.openstack.org/openstack/puppet-sahara',
+  :git => 'https://opendev.org/openstack/puppet-sahara',
   :ref => 'stable/queens'
 
 mod 'swift',
-  :git => 'https://git.openstack.org/openstack/puppet-swift',
+  :git => 'https://opendev.org/openstack/puppet-swift',
   :ref => 'stable/queens'
 
 mod 'tacker',
-  :git => 'https://git.openstack.org/openstack/puppet-tacker',
+  :git => 'https://opendev.org/openstack/puppet-tacker',
   :ref => 'stable/queens'
 
 mod 'tempest',
-  :git => 'https://git.openstack.org/openstack/puppet-tempest',
+  :git => 'https://opendev.org/openstack/puppet-tempest',
   :ref => 'stable/queens'
 
 mod 'trove',
-  :git => 'https://git.openstack.org/openstack/puppet-trove',
+  :git => 'https://opendev.org/openstack/puppet-trove',
   :ref => 'stable/queens'
 
 mod 'vswitch',
-  :git => 'https://git.openstack.org/openstack/puppet-vswitch',
+  :git => 'https://opendev.org/openstack/puppet-vswitch',
   :ref => 'stable/queens'
 
 mod 'vitrage',
-  :git => 'https://git.openstack.org/openstack/puppet-vitrage',
+  :git => 'https://opendev.org/openstack/puppet-vitrage',
   :ref => 'stable/queens'
 
 mod 'watcher',
-  :git => 'https://git.openstack.org/openstack/puppet-watcher',
+  :git => 'https://opendev.org/openstack/puppet-watcher',
   :ref => 'stable/queens'
 
 mod 'zaqar',
-  :git => 'https://git.openstack.org/openstack/puppet-zaqar',
+  :git => 'https://opendev.org/openstack/puppet-zaqar',
   :ref => 'stable/queens'
 
 ## External modules
diff --git a/README.md b/README.md
index c51f79fb6..cfec88f4f 100644
--- a/README.md
+++ b/README.md
@@ -116,7 +116,7 @@ If you're new in Puppet OpenStack and you want to deploy an All-In-One setup of
 an OpenStack Cloud with the Puppet modules, please follow the steps:
 
 ```bash
-git clone https://git.openstack.org/openstack/puppet-openstack-integration
+git clone https://opendev.org/openstack/puppet-openstack-integration
 cd puppet-openstack-integration
 ./all-in-one.sh
 ```
diff --git a/all-in-one.sh b/all-in-one.sh
index b3b977089..410b06e64 100755
--- a/all-in-one.sh
+++ b/all-in-one.sh
@@ -23,7 +23,7 @@
 # * At least 10GB of storage
 #
 # Usage:
-# $ git clone https://git.openstack.org/openstack/puppet-openstack-integration
+# $ git clone https://opendev.org/openstack/puppet-openstack-integration
 # $ cd puppet-openstack-integration
 # $ ./all-in-one.sh
 #
diff --git a/run_tests.sh b/run_tests.sh
index cbe2f5d22..71d5b7fd3 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -112,7 +112,7 @@ if [ -d /home/zuul/src/opendev.org ]; then
             [ ! -d /tmp/openstack ] && mkdir -p /tmp/openstack
             cp -R /home/zuul/src/opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
         else
-            git clone https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
+            git clone -b 0.2.0 https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
         fi
     fi
     if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
@@ -120,7 +120,7 @@ if [ -d /home/zuul/src/opendev.org ]; then
             [ ! -d /tmp/openstack ] && mkdir -p /tmp/openstack
             cp -R /home/zuul/src/opendev.org/openstack/tempest /tmp/openstack/tempest
         else
-            git clone https://opendev.org/openstack/tempest /tmp/openstack/tempest
+            git clone -b 22.1.0 https://opendev.org/openstack/tempest /tmp/openstack/tempest
         fi
         # Pin Tempest to TEMPEST_VERSION unless we're running inside the
         # openstack/tempest gate.
@@ -134,11 +134,11 @@ else
     # For ubuntu we always need to deploy tempest-horizon from source
     if uses_debs; then
         $SUDO rm -rf /tmp/openstack/tempest-horizon
-        git clone https://git.openstack.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
+        git clone -b 0.2.0 https://opendev.org/openstack/tempest-horizon /tmp/openstack/tempest-horizon
     fi
     if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
         $SUDO rm -rf /tmp/openstack/tempest
-        git clone https://git.openstack.org/openstack/tempest /tmp/openstack/tempest
+        git clone -b 22.1.0 https://opendev.org/openstack/tempest /tmp/openstack/tempest
         pushd /tmp/openstack/tempest
         git reset --hard origin/$TEMPEST_VERSION
         popd
@@ -258,7 +258,7 @@ $SUDO chown -R "$(id -u):$(id -g)" /tmp/openstack/tempest/
 # install from source now on ubuntu until packaged
 if uses_debs; then
     cd /tmp/openstack/tempest-horizon; $SUDO python setup.py install
-    $SUDO pip install -U stestr os-testr
+    $SUDO pip install -U stestr==2.6.0 os-testr==1.1.0
 fi
 
 set +e
@@ -329,7 +329,7 @@ cd /tmp/openstack/tempest
 
 if [ "${TEMPEST_FROM_SOURCE}" = true ]; then
     virtualenv --system-site-packages run_tempest
-    run_tempest/bin/pip install -c https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt -U -r requirements.txt
+    run_tempest/bin/pip install -c https://opendev.org/openstack/requirements/raw/branch/stable/queens/upper-constraints.txt -U -r requirements.txt
     run_tempest/bin/python setup.py install
     export tempest_binary="run_tempest/bin/tempest"
 else