diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index 1f27808b74..b695b800d5 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -1,325 +1,325 @@
 - name: ansible-hardening
   scm: git
   src: https://opendev.org/openstack/ansible-hardening
-  version: 141c98dbeecb37b736762f32534072873f662cdf
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: apt_package_pinning
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
-  version: 434478c28955327e36ac098d2843b90427bf964c
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: config_template
   scm: git
   src: https://opendev.org/openstack/ansible-config_template
-  version: 8a9b9622d5225177891bf0fa14b4b37b8c5fb379
+  version: master
   trackbranch: master
 - name: galera_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-galera_server
-  version: e2643a1a142679dfb8c38e67dc5c6c0749c31647
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: ceph_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-ceph_client
-  version: 13657acfb26742ea10906c3f5a008f35561174e8
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: haproxy_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-haproxy_server
-  version: d49c53dcf0c9e4b86ca3ff9ecb4ec7fa67f3b58c
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: b5fe49d98601f62055365645df47ef1bae30ee74
+  version: master
   trackbranch: master
 - name: lxc_container_create
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
-  version: 95a85139dda56d550a7ab0fe0da5c71facca4d97
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: lxc_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
-  version: c389c026c2220e8bddeafa6a3d55d23b6bddd04e
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: memcached_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-memcached_server
-  version: 866db1969d6e9edfb0ce54f5fc7f893ad48d43d8
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: openstack_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
-  version: 4923bc834ffa5c8cb99b87f267f2669f4004229f
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_keystone
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_keystone
-  version: 429de8b7a1b6b1a52b07d2321566aa90ea10a731
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: openstack_openrc
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
-  version: 52e249cfe5f83d44dfcb512548a40775b955826e
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_adjutant
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_adjutant
-  version: c8ee47b3a9c9a6a69bcedc196c1183d9b9f2249b
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_aodh
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_aodh
-  version: c8b97900948b9c04f1ffc55cc367c4f0adbb0042
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_barbican
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_barbican
-  version: 302178f9a5b8d91c0f9c3b391455b579dd09f10c
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_blazar
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_blazar
-  version: 114460a935e2d74ee29a87ecca65b76a33937b92
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_ceilometer
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
-  version: 2a7e249d95863bfcf3bfd9bccd9e2b35d291a1a5
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_cinder
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cinder
-  version: d412e1b7015a482d30d1b1fe5052c947a25ce880
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_cloudkitty
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
-  version: 47e95e86449979b7cd4cdcfd9a77bb93a0bc90a9
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_designate
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_designate
-  version: 319e00295bd1d91865a22c7c78b289ed15c55f68
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_glance
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_glance
-  version: 09e142ce94d32f001bdcb6953cb6af80ae3985ae
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_gnocchi
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
-  version: 9e409492ff11895363b6eb6d0771d277975786a9
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_heat
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_heat
-  version: 0061c0a3f6ae2cbcd20ac8105093ced9ad54310c
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_horizon
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_horizon
-  version: 6e331b16ea65d402ca7d6e5ac91a259232a199b5
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_ironic
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ironic
-  version: 570879e85f44bdf06dcce3a4edbefb986e282653
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_magnum
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_magnum
-  version: 176d814e74a7c132763393b4c52f9e6f75535007
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_manila
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_manila
-  version: 616458635adf0d8399d5371f72d250e2043cc1df
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_masakari
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_masakari
-  version: 95093ace1379c2cf22e4d4834f65d7c4ebbca91d
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_mistral
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_mistral
-  version: fce6170874c229e1f03bda4c9435c72aca63333e
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_murano
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_murano
-  version: d45e5f918a48fff2f1427f5100f6bc4521e1ffbb
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_neutron
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_neutron
-  version: 29e5fbf252074bd8cefb875911d88f58af9cb205
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_nova
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_nova
-  version: 5a1a798e4ca5923e8ae8ada9f277879b9117bbef
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_octavia
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_octavia
-  version: 0f89cac86cfb9b2706669c97c02d394770acf08b
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_panko
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_panko
-  version: e25d1a7d16c74d6d87ad4d8f1a3242982deca2ec
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_placement
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_placement
-  version: 26886e42afa2f63078a4bc221470cb7f1cede054
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_rally
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_rally
-  version: fbdc19066d9646e3e1dc2afdcb07e5674c02c365
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_sahara
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_sahara
-  version: 72d1b4d4b7004a611c3886e5c7993c3bde5c13a6
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_senlin
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_senlin
-  version: 5d90bfe91ce2eb5c2dda39bc2a352673d6b25253
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_swift
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_swift
-  version: 2e5b9ca11aaece1755ac882fbe475d0471ca0b5f
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_tacker
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tacker
-  version: 69761c1f542184af553fc65754557ce470f9c0ff
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_tempest
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tempest
-  version: 42f33d8cae55c7e6c361564010e0651703bc3ac5
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_trove
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_trove
-  version: 307b1b08c3f84c40adb5e5a87d1f9c6c7d7c1c60
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: os_zun
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_zun
-  version: 6100acfd33cbcd3a31ace6f66573073bb5f098a1
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: plugins
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-plugins
-  version: f89b7f0aaf69b9d0877e6380bfc009f24b4e3f84
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: qdrouterd
   scm: git
   src: https://opendev.org/openstack/ansible-role-qdrouterd
-  version: 1c06fe38f0aaa251e50c321bdb2f7cb8c5391d17
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: rabbitmq_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
-  version: 87a3f4fa3a50a3a2959cf841deb03c8aea5f32fc
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: repo_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-repo_server
-  version: 2a5ae448bc9c26c36eb02e1050b9b2ffe7aa4f08
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: rsyslog_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rsyslog_client
-  version: 91ee683e978fd35cf2a6a8190ee5258edce20fd6
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: rsyslog_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rsyslog_server
-  version: 5340b650e513ed6323602879c0db841681c5bc59
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: sshd
   scm: git
   src: https://github.com/willshersystems/ansible-sshd
-  version: c4db22f16dd59e61881c4ff026e2804a170446a1
+  version: master
   trackbranch: master
 - name: bird
   scm: git
   src: https://github.com/logan2211/ansible-bird
-  version: 9e5a7d7fc8b72ad4aa73280a7638b0554cf20d5c
+  version: master
   trackbranch: master
 - name: etcd
   scm: git
   src: https://github.com/logan2211/ansible-etcd
-  version: ab9861e35c23342fa30c703d29e370da590ea582
+  version: master
   trackbranch: master
 - name: unbound
   scm: git
   src: https://github.com/logan2211/ansible-unbound
-  version: f8e2d8a89ddb9352d5748332a5f3a33ed33f66ab
+  version: master
   trackbranch: master
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: f7f694b3dd4361e364dccb4ce94e6510727fca2f
+  version: master
   trackbranch: master
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: a348116bf7e5c7a81574bab4256833b841f43930
+  version: stable-5.0
   trackbranch: stable-5.0
 - name: opendaylight
   scm: git
   src: https://github.com/opendaylight/integration-packaging-ansible-opendaylight
-  version: 4a9217ed0fe9078152435daaa2d3f45b81021b3a
+  version: master
   trackbranch: master
 - name: haproxy_endpoints
   scm: git
   src: https://github.com/logan2211/ansible-haproxy-endpoints
-  version: 8e3a24a35beb16d717072dc83895c5a1f92689fb
+  version: master
   trackbranch: master
 - name: pacemaker_corosync
   scm: git
   src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
+  version: master
   trackbranch: master
-  version: 70d3c59efea4c3080fa66aeef75eadd0a032a83e
 - name: systemd_service
   src: https://opendev.org/openstack/ansible-role-systemd_service
   scm: git
-  version: 9d14e194caa46fb503d1be72c96916cd90b88997
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: systemd_mount
   src: https://opendev.org/openstack/ansible-role-systemd_mount
   scm: git
-  version: 00a542c7fccf56cb6314f04b949c62eede2f6f17
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: systemd_networkd
   src: https://opendev.org/openstack/ansible-role-systemd_networkd
   scm: git
-  version: e5de91480723fa43de7e0a240d3b0727adf8738a
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: python_venv_build
   src: https://opendev.org/openstack/ansible-role-python_venv_build
   scm: git
-  version: 0e735c4f8f0442588482bd60c2307f9e7023fe3b
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: uwsgi
   src: https://opendev.org/openstack/ansible-role-uwsgi
   scm: git
-  version: d91a7bf8505e4d5ac01167084df97bc8b229cbd0
-  trackbranch: stable/wallaby
+  version: master
+  trackbranch: master
 - name: pki
   src: https://opendev.org/openstack/ansible-role-pki
   scm: git
-  trackbranch: stable/wallaby
-  version: 6085b72be2abd0b7ff60e195bd55c00a8393cef1
+  trackbranch: master
+  version: master
diff --git a/deploy-guide/source/conf.py b/deploy-guide/source/conf.py
index bba8350526..2636cd6a39 100644
--- a/deploy-guide/source/conf.py
+++ b/deploy-guide/source/conf.py
@@ -32,8 +32,8 @@ import openstackdocstheme
 # Variables to override
 target_name = 'openstack-ansible'
 description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = 'victoria'
-current_series_name = 'wallaby'
+previous_series_name = 'wallaby'
+current_series_name = 'xena'
 
 # General information about the project.
 author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/conf.py b/doc/source/conf.py
index a0e6b1e7f6..5ff2dd3b2d 100644
--- a/doc/source/conf.py
+++ b/doc/source/conf.py
@@ -33,8 +33,8 @@ import yaml
 # Variables to override
 target_name = 'openstack-ansible'
 description = 'OpenStack-Ansible deploys OpenStack environments using Ansible.'
-previous_series_name = 'victoria'
-current_series_name = 'wallaby'
+previous_series_name = 'wallaby'
+current_series_name = 'xena'
 
 # General information about the project.
 author = 'OpenStack-Ansible Contributors'
diff --git a/doc/source/index.rst b/doc/source/index.rst
index 1cbf693a8f..e2a18db154 100644
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -10,22 +10,35 @@ configuration of an OpenStack environment.
 Documentation for each of the following releases is available.
 
 
+Xena: Under Development
+~~~~~~~~~~~~~~~~~~~~~~~
+
+OpenStack-Ansible Xena is currently in development.
+
+.. toctree::
+   :maxdepth: 1
+
+   Deployment guide <https://docs.openstack.org/project-deploy-guide/openstack-ansible/latest/>
+   Release notes <https://docs.openstack.org/releasenotes/openstack-ansible/unreleased.html>
+   admin/index
+   user/index
+   contributor/contributing
+   contributor/index
+   reference/index
+
+
 Wallaby: Maintained
 ~~~~~~~~~~~~~~~~~~~
 
 OpenStack-Ansible Wallaby series was first released with the 23.0.0 tag on
 02 July 2021.
 
-.. toctree::
-   :maxdepth: 1
+* `OpenStack-Ansible Wallaby Documentation`_
 
-   Deployment guide <https://docs.openstack.org/project-deploy-guide/openstack-ansible/wallaby/>
-   Release notes <https://docs.openstack.org/releasenotes/openstack-ansible/wallaby.html>
-   admin/index
-   user/index
-   contributor/contributing
-   contributor/index
-   reference/index
+* `OpenStack-Ansible Wallaby series release notes`_
+
+.. _OpenStack-Ansible Wallaby Documentation: https://docs.openstack.org/openstack-ansible/wallaby/
+.. _OpenStack-Ansible Wallaby series release notes: https://docs.openstack.org/releasenotes/openstack-ansible/wallaby.html
 
 
 Victoria: Maintained
diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml
index 624d9d193d..ca1c445aa2 100644
--- a/playbooks/defaults/repo_packages/gnocchi.yml
+++ b/playbooks/defaults/repo_packages/gnocchi.yml
@@ -33,5 +33,5 @@
 ## This service has a different stable branch strategy to the rest of OpenStack.
 ## The SHA is recorded here to make the SHA updating easier.
 gnocchi_git_repo: https://github.com/gnocchixyz/gnocchi
-gnocchi_git_install_branch: 350fdf98d886103ac12017280efe7c08964d8136  # HEAD as of 26.06.2021
+gnocchi_git_install_branch: 350fdf98d886103ac12017280efe7c08964d8136  # HEAD as of 30.06.2021
 gnocchi_git_track_branch: stable/4.4
diff --git a/playbooks/defaults/repo_packages/nova_consoles.yml b/playbooks/defaults/repo_packages/nova_consoles.yml
index 72704976f0..1e68fd207e 100644
--- a/playbooks/defaults/repo_packages/nova_consoles.yml
+++ b/playbooks/defaults/repo_packages/nova_consoles.yml
@@ -27,11 +27,11 @@
 
 ## NOVNC from source
 novncproxy_git_repo: https://github.com/novnc/noVNC
-novncproxy_git_install_branch: dd20b17d49a2394b586175f870e00b4b64c2817d # HEAD as of 26.06.2021
+novncproxy_git_install_branch: d44ddbe186e06c1c3e0cf899779f2e037f8da952 # HEAD as of 30.06.2021
 novncproxy_git_track_branch: master
 
 
 ## spice-html5 from source
 spicehtml5_git_repo: https://github.com/freedesktop/spice-html5
-spicehtml5_git_install_branch: 56ddb3005e39a9e76670fec9676e667d44167bf3 # HEAD as of 26.06.2021
+spicehtml5_git_install_branch: 56ddb3005e39a9e76670fec9676e667d44167bf3 # HEAD as of 30.06.2021
 spicehtml5_git_track_branch: master
diff --git a/playbooks/defaults/repo_packages/openstack_services.yml b/playbooks/defaults/repo_packages/openstack_services.yml
index ade7559930..280561dd44 100644
--- a/playbooks/defaults/repo_packages/openstack_services.yml
+++ b/playbooks/defaults/repo_packages/openstack_services.yml
@@ -31,298 +31,298 @@
 
 ## Global Requirements
 requirements_git_repo: https://opendev.org/openstack/requirements
-requirements_git_install_branch: 98091329cf49a3abc4840343401711bdb4f05bd3 # HEAD as of 20.05.2021
-requirements_git_track_branch: stable/wallaby
+requirements_git_install_branch: 08fc133101542dd44a38da9c4a241f6c01f2f669 # HEAD as of 20.05.2021
+requirements_git_track_branch: master
 
 ## Adjutant service
 adjutant_git_repo: https://opendev.org/openstack/adjutant
-adjutant_git_install_branch: ad19ed13b65b583e65b5a19e04a0f0403c366b09 # HEAD as of 26.06.2021
-adjutant_git_track_branch: stable/wallaby
+adjutant_git_install_branch: d9045e4b105a3b88067c7f30915ca92fa697f150 # HEAD as of 30.06.2021
+adjutant_git_track_branch: master
 
 ## Adjutant dashboard plugin
 adjutant_dashboard_git_repo: https://opendev.org/openstack/adjutant-ui
-adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393 # HEAD as of 26.06.2021
-adjutant_dashboard_git_track_branch: stable/wallaby
+adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393 # HEAD as of 30.06.2021
+adjutant_dashboard_git_track_branch: master
 
 ## Aodh service
 aodh_git_repo: https://opendev.org/openstack/aodh
-aodh_git_install_branch: 1fb8cde66b81c6e138749956824c7676ba6073a7 # HEAD as of 26.06.2021
-aodh_git_track_branch: stable/wallaby
+aodh_git_install_branch: 8404e9ac7407d440172f54ac83c7b11f84332d4a # HEAD as of 30.06.2021
+aodh_git_track_branch: master
 
 
 ## Barbican service
 barbican_git_repo: https://opendev.org/openstack/barbican
-barbican_git_install_branch: bac7d2205a87438c8d24ef0497beb58fe36d0521 # HEAD as of 26.06.2021
-barbican_git_track_branch: stable/wallaby
+barbican_git_install_branch: 123c73a550bfc7979e0f056314f6e633f941a47a # HEAD as of 30.06.2021
+barbican_git_track_branch: master
 
 
 ## Barbican dashboard plugin
 barbican_dashboard_git_repo: https://opendev.org/openstack/barbican-ui
-barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271 # HEAD as of 26.06.2021
+barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271 # HEAD as of 30.06.2021
 barbican_dashboard_git_track_branch: master
 
 
 ## Ceilometer service
 ceilometer_git_repo: https://opendev.org/openstack/ceilometer
-ceilometer_git_install_branch: 788ed4780162fdea3fef4ab4d2579ffdc5548424 # HEAD as of 26.06.2021
-ceilometer_git_track_branch: stable/wallaby
+ceilometer_git_install_branch: 14922b71d2eebcf939963d010904525b01b2897e # HEAD as of 30.06.2021
+ceilometer_git_track_branch: master
 
 
 ## Cinder service
 cinder_git_repo: https://opendev.org/openstack/cinder
-cinder_git_install_branch: 624f63f340dbe5759d196504cc357050ad3c140a # HEAD as of 26.06.2021
-cinder_git_track_branch: stable/wallaby
+cinder_git_install_branch: 61ae43442d137954464ed4a9b4c1fb4ef739bdd6 # HEAD as of 30.06.2021
+cinder_git_track_branch: master
 
 
 ## Cloudkitty service
 cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty
-cloudkitty_git_install_branch: c8f095c8f186b2ace179b5d1d0105203c71c9ef1 # HEAD as of 26.06.2021
-cloudkitty_git_track_branch: stable/wallaby
+cloudkitty_git_install_branch: 70114c829e292d97e424b6697568fd285dc668cb # HEAD as of 30.06.2021
+cloudkitty_git_track_branch: master
 
 
 ## Cloudkitty dashboard plugin
 cloudkitty_dashboard_git_repo: https://opendev.org/openstack/cloudkitty-dashboard
-cloudkitty_dashboard_git_install_branch: 31c6d8c3164a1386fd0ada8e1d24fb58180c3214 # HEAD as of 26.06.2021
-cloudkitty_dashboard_git_track_branch: stable/wallaby
+cloudkitty_dashboard_git_install_branch: 5ba6d40381c29b6bdeed9793fdff23d0787e43d0 # HEAD as of 30.06.2021
+cloudkitty_dashboard_git_track_branch: master
 
 
 ## Designate service
 designate_git_repo: https://opendev.org/openstack/designate
-designate_git_install_branch: d7cd95847a04a74ccce58bd7fd52fde5ecd52c21 # HEAD as of 26.06.2021
-designate_git_track_branch: stable/wallaby
+designate_git_install_branch: 5d1127d3e06f6590bea5582c58229691bea41c8e # HEAD as of 30.06.2021
+designate_git_track_branch: master
 
 
 ## Horizon Designate dashboard plugin
 designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard
-designate_dashboard_git_install_branch: a65ea0165cd5b511ed23c36382b1a29d8d41df6d # HEAD as of 26.06.2021
-designate_dashboard_git_track_branch: stable/wallaby
+designate_dashboard_git_install_branch: 87a4380a7a6981876c2db91c5ae1fa922ad91ba3 # HEAD as of 30.06.2021
+designate_dashboard_git_track_branch: master
 
 
 ## Glance service
 glance_git_repo: https://opendev.org/openstack/glance
-glance_git_install_branch: b5437773b20db3d6ef20d449a8a43171c8fc7f69 # HEAD as of 26.06.2021
-glance_git_track_branch: stable/wallaby
+glance_git_install_branch: f3eb5214a34eb96fcf5f534723178d46429e5a01 # HEAD as of 30.06.2021
+glance_git_track_branch: master
 
 
 ## Heat service
 heat_git_repo: https://opendev.org/openstack/heat
-heat_git_install_branch: 7b9ffc5bed4555a8eb26b954d454aa172773417a # HEAD as of 26.06.2021
-heat_git_track_branch: stable/wallaby
+heat_git_install_branch: b812a98d3b95bcca3bbda56dc8169b010233d813 # HEAD as of 30.06.2021
+heat_git_track_branch: master
 
 ## Horizon Heat dashboard plugin
 heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard
-heat_dashboard_git_install_branch: cd889e6146ca11c70cd2a020a66547b270bf2660 # HEAD as of 26.06.2021
-heat_dashboard_git_track_branch: stable/wallaby
+heat_dashboard_git_install_branch: 1fbbf77a0a01149ce39e6b68c1a9845ae89dc17d # HEAD as of 30.06.2021
+heat_dashboard_git_track_branch: master
 
 ## Horizon service
 horizon_git_repo: https://opendev.org/openstack/horizon
-horizon_git_install_branch: f3487d6e60e2cb9f65559f5dd76d71fb04d3897d # HEAD as of 26.06.2021
-horizon_git_track_branch: stable/wallaby
+horizon_git_install_branch: 310a24d05401cfe2aceeccb77013967cf1afc3d2 # HEAD as of 30.06.2021
+horizon_git_track_branch: master
 
 ## Horizon Ironic dashboard plugin
 ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: 98f31e49e2c916bc56baaaffe717ca3ab7adce87 # HEAD as of 26.06.2021
-ironic_dashboard_git_track_branch: stable/wallaby
+ironic_dashboard_git_install_branch: 9488051e4fbe396c94456df6698b5eb7a1e6bb73 # HEAD as of 30.06.2021
+ironic_dashboard_git_track_branch: master
 
 ## Horizon Magnum dashboard plugin
 magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui
-magnum_dashboard_git_install_branch: e523a37bde515954478c14bb9e510f5c53cbe981 # HEAD as of 26.06.2021
-magnum_dashboard_git_track_branch: stable/wallaby
+magnum_dashboard_git_install_branch: defed81ab78bc6098a3ec7652a6eb6e649232b06 # HEAD as of 30.06.2021
+magnum_dashboard_git_track_branch: master
 
 ## Horizon Masakari dashboard plugin
 masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard
-masakari_dashboard_git_install_branch: b14c036daa7ee109c864922cee0ac08a5f2f66a8 # HEAD as of 26.06.2021
-masakari_dashboard_git_track_branch: stable/wallaby
+masakari_dashboard_git_install_branch: a01dacca8a49b1cdb71191389e786ce5392b08cd # HEAD as of 30.06.2021
+masakari_dashboard_git_track_branch: master
 
 
 ## Horizon Sahara dashboard plugin
 sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard
-sahara_dashboard_git_install_branch: 211f92dc453b37f8c2f9245b19e345e881cf4b95 # HEAD as of 26.06.2021
-sahara_dashboard_git_track_branch: stable/wallaby
+sahara_dashboard_git_install_branch: 4604f95cb22c8322a3bef9e59969d659f22e1a0a # HEAD as of 30.06.2021
+sahara_dashboard_git_track_branch: master
 
 
 ## Keystone service
 keystone_git_repo: https://opendev.org/openstack/keystone
-keystone_git_install_branch: f510c806de3e20cdedd55291cd58dafa59398bec # HEAD as of 26.06.2021
-keystone_git_track_branch: stable/wallaby
+keystone_git_install_branch: 252733dce7ae7d335b982d36e96b64e7a29d4ef2 # HEAD as of 30.06.2021
+keystone_git_track_branch: master
 
 
 ## Manila service
 manila_git_repo: https://opendev.org/openstack/manila
-manila_git_install_branch: 377fbc3acd3943440235eb79a8a2f6fe438f16ee # HEAD as of 26.06.2021
-manila_git_track_branch: stable/wallaby
+manila_git_install_branch: daf7b3aacf1481c967db4706e7cfa7be09976c52 # HEAD as of 30.06.2021
+manila_git_track_branch: master
 
 
 ## Neutron service
 neutron_git_repo: https://opendev.org/openstack/neutron
-neutron_git_install_branch: aee0ffd8caa9557c70c7164c4dfa8075a85dac30 # HEAD as of 26.06.2021
-neutron_git_track_branch: stable/wallaby
+neutron_git_install_branch: 7e8da3c0b8155f8d464248c526a594d706e5cc90 # HEAD as of 30.06.2021
+neutron_git_track_branch: master
 
 neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 2cf3451517c09dc998bc7e3e194916601a728c03 # HEAD as of 26.06.2021
-neutron_vpnaas_git_track_branch: stable/wallaby
+neutron_vpnaas_git_install_branch: 52eba441d171575726dc97c8b5c98681e65ac327 # HEAD as of 30.06.2021
+neutron_vpnaas_git_track_branch: master
 
 
 neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
-neutron_dynamic_routing_git_install_branch: cf256fa24d03022936c50feba513de4256ff48de # HEAD as of 26.06.2021
-neutron_dynamic_routing_git_track_branch: stable/wallaby
+neutron_dynamic_routing_git_install_branch: 7245c228c2a083a7700d20224cb82a6c216cdd63 # HEAD as of 30.06.2021
+neutron_dynamic_routing_git_track_branch: master
 
 # Networking calico follows master
 networking_calico_git_repo: https://github.com/projectcalico/networking-calico
-networking_calico_git_install_branch: ff42aafb57b1a249f59356c2ed61b52762319b18 # HEAD as of 26.06.2021
-networking_calico_git_track_branch: release-v3.18
+networking_calico_git_install_branch: 5a930a2a1cd882dde6c064e8cd240fbf4ff233d6 # HEAD as of 30.06.2021
+networking_calico_git_track_branch: release-v3.19
 
 networking_odl_git_repo: https://opendev.org/openstack/networking-odl
-networking_odl_git_install_branch: b377b3aa527a87f415f1a6a59362229f99855802 # HEAD as of 26.06.2021
-networking_odl_git_track_branch: stable/wallaby
+networking_odl_git_install_branch: a413efcbf389f2e9c71538365cad522ada219806 # HEAD as of 30.06.2021
+networking_odl_git_track_branch: master
 
 networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn
-networking_bgpvpn_git_install_branch: 2d4dcc8b1b5cf4bc5a68261045aad0c02fcb8185 # HEAD as of 26.06.2021
-networking_bgpvpn_git_track_branch: stable/wallaby
+networking_bgpvpn_git_install_branch: 5f7a129dbb30b5bd9af27653e66749a9d8888c5a # HEAD as of 30.06.2021
+networking_bgpvpn_git_track_branch: master
 
 networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc
-networking_sfc_git_install_branch: 71d44504dab4eac9c802db6962c10b956f52ffb1 # HEAD as of 26.06.2021
-networking_sfc_git_track_branch: stable/wallaby
+networking_sfc_git_install_branch: e01048cc521c2c16f36cea23eef8331c6bae0904 # HEAD as of 30.06.2021
+networking_sfc_git_track_branch: master
 
 networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch
-networking_generic_switch_git_install_branch: 9dc003025bb8d2f1a73264acb1fcc7260a98d22c # HEAD as of 26.06.2021
-networking_generic_switch_git_track_branch: stable/wallaby
+networking_generic_switch_git_install_branch: 33f7bda2d95e2ab261a75ce3929a244a5cb6fb6c # HEAD as of 30.06.2021
+networking_generic_switch_git_track_branch: master
 
 networking_nsx_git_repo: https://opendev.org/x/vmware-nsx
-networking_nsx_git_install_branch: fe0e3089cbef2c1342f6ecf9891803b397330649 # HEAD as of 26.06.2021
+networking_nsx_git_install_branch: 03821d95345f60a9b9902553cb1d3bb096c0c1e8 # HEAD as of 30.06.2021
 networking_nsx_git_track_branch: master
 
 networking_nsxlib_git_repo: https://opendev.org/x/vmware-nsxlib
-networking_nsxlib_git_install_branch: d717cee827acb194d5a138fc50e36a64fcfedc9d # HEAD as of 26.06.2021
+networking_nsxlib_git_install_branch: d717cee827acb194d5a138fc50e36a64fcfedc9d # HEAD as of 30.06.2021
 networking_nsxlib_git_track_branch: master
 
 ## Nova service
 nova_git_repo: https://opendev.org/openstack/nova
-nova_git_install_branch: 97c3517e7e94c8b174b51c60eab92d897120bf83 # HEAD as of 26.06.2021
-nova_git_track_branch: stable/wallaby
+nova_git_install_branch: ee3b4925064c843ba497179624e128985880a7d2 # HEAD as of 30.06.2021
+nova_git_track_branch: master
 
 
 ## Sahara service
 sahara_git_repo: https://opendev.org/openstack/sahara
-sahara_git_install_branch: 452affc54ba98031d0b75d61ed91329364e79c97 # HEAD as of 26.06.2021
-sahara_git_track_branch: stable/wallaby
+sahara_git_install_branch: 622af6949b2f9da0fcd3f8d75ab89b79b50f42d4 # HEAD as of 30.06.2021
+sahara_git_track_branch: master
 
 
 ## Senlin service
 senlin_git_repo: https://opendev.org/openstack/senlin
-senlin_git_install_branch: c7842da4cf357faab343f0974e37dda448364ce4 # HEAD as of 26.06.2021
-senlin_git_track_branch: stable/wallaby
+senlin_git_install_branch: 2b2d51d748f90f09fae56658341e536aa56128e0 # HEAD as of 30.06.2021
+senlin_git_track_branch: master
 
 
 ## Swift service
 swift_git_repo: https://opendev.org/openstack/swift
-swift_git_install_branch: c966628978ac4ceb1d94ba92879df071b8ca265d # HEAD as of 26.06.2021
-swift_git_track_branch: stable/wallaby
+swift_git_install_branch: 8e1209d2b1b41193ddb3f616036d3a1475ed1210 # HEAD as of 30.06.2021
+swift_git_track_branch: master
 
 
 ## Ironic service
 ironic_git_repo: https://opendev.org/openstack/ironic
-ironic_git_install_branch: b88956550e3755491b309bd2a3be4e2188271f2f # HEAD as of 26.06.2021
-ironic_git_track_branch: stable/wallaby
+ironic_git_install_branch: e539ae5f1ff574c109c22aa3eaf7bcfb34694bcb # HEAD as of 30.06.2021
+ironic_git_track_branch: master
 
 
 ## Ironic inspector service
 ironic_inspector_git_repo: https://opendev.org/openstack/ironic-inspector
-ironic_inspector_git_install_branch: 0d868c61fc26abc12bd57a31338a1471625b5986 # HEAD as of 26.06.2021
-ironic_inspector_git_track_branch: stable/wallaby
+ironic_inspector_git_install_branch: 948325cae7f3fcce7589014509fa146373398d82 # HEAD as of 30.06.2021
+ironic_inspector_git_track_branch: master
 
 
 ## Magnum service
 magnum_git_repo: https://opendev.org/openstack/magnum
-magnum_git_install_branch: 6a42e1246fcafa9b0ab50bce27189beade14c464 # HEAD as of 26.06.2021
-magnum_git_track_branch: stable/wallaby
+magnum_git_install_branch: b2e20a11432103b664bafc0862252122063c32e6 # HEAD as of 30.06.2021
+magnum_git_track_branch: master
 
 ## Masakari service
 masakari_git_repo: https://opendev.org/openstack/masakari
-masakari_git_install_branch: c366cdeb3835364dd54199a83f78175f646f0d9b # HEAD as of 26.06.2021
-masakari_git_track_branch: stable/wallaby
+masakari_git_install_branch: f2e830f9278a2bf1b3ac9b042bd25393f8793916 # HEAD as of 30.06.2021
+masakari_git_track_branch: master
 
 ## Masakari monitors services
 masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors
-masakari_monitors_git_install_branch: 019af1c0bc68f87187258f9e22bf3e7ce13b21ca # HEAD as of 26.06.2021
-masakari_monitors_git_track_branch: stable/wallaby
+masakari_monitors_git_install_branch: 6a496e78713fb8db56ccc1a6ad6ab007b88d102e # HEAD as of 30.06.2021
+masakari_monitors_git_track_branch: master
 
 ## Mistral service
 mistral_git_repo: https://opendev.org/openstack/mistral
-mistral_git_install_branch: c2a0205d56642ad920d94953079c98e17c7b3536 # HEAD as of 26.06.2021
-mistral_git_track_branch: stable/wallaby
+mistral_git_install_branch: c63e6e086ea119aa51d4f8b86ba1096a19f86b4a # HEAD as of 30.06.2021
+mistral_git_track_branch: master
 
 ## Murano service
 murano_git_repo: https://opendev.org/openstack/murano
-murano_git_install_branch: 2b3a4f3117d437cd832f010218acf466a8321763 # HEAD as of 26.06.2021
-murano_git_track_branch: stable/wallaby
+murano_git_install_branch: 67baf3175ddbeedb3d1ebe13a5cee1d2628bab27 # HEAD as of 30.06.2021
+murano_git_track_branch: master
 
 murano_dashboard_git_repo: https://opendev.org/openstack/murano-dashboard
-murano_dashboard_git_install_branch: c01fbfcaeabd74f2a6b5edbe07c7d9d7515a9dea # HEAD as of 26.06.2021
-murano_dashboard_git_track_branch: stable/wallaby
+murano_dashboard_git_install_branch: 6175248cef1954e30645537dd4b442c3deb2676e # HEAD as of 30.06.2021
+murano_dashboard_git_track_branch: master
 
 ## Trove service
 trove_git_repo: https://opendev.org/openstack/trove
-trove_git_install_branch: a401b761d93eca6b2d34aaeced09ed0331b419cc # HEAD as of 26.06.2021
-trove_git_track_branch: stable/wallaby
+trove_git_install_branch: b050996b9f6df738a0f68ac36a5b5f17f8bb2bc2 # HEAD as of 30.06.2021
+trove_git_track_branch: master
 
 ## Horizon Trove dashboard plugin
 trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard
-trove_dashboard_git_install_branch: 5d40d075d53279f387301a6a56757ae8d497d8d3 # HEAD as of 26.06.2021
-trove_dashboard_git_track_branch: stable/wallaby
+trove_dashboard_git_install_branch: 05d15b33cbc062d0d2013ae347a07c87f53af6e0 # HEAD as of 30.06.2021
+trove_dashboard_git_track_branch: master
 
 
 ## Octavia service
 octavia_git_repo: https://opendev.org/openstack/octavia
-octavia_git_install_branch: c657b82f406cb8f0ec8bc688b5c793e8acbc6979 # HEAD as of 26.06.2021
-octavia_git_track_branch: stable/wallaby
+octavia_git_install_branch: d10c9c2f9afacff8047a8005843483a07fe7472e # HEAD as of 30.06.2021
+octavia_git_track_branch: master
 
 
 ## Panko service
 panko_git_repo: https://opendev.org/openstack/panko
-panko_git_install_branch: 276d891675c692c146448180767f97362871b493 # HEAD as of 26.06.2021
-panko_git_track_branch: stable/wallaby
+panko_git_install_branch: ca45bbdca049c6544cd9ece0d564ae7f20a1cd78 # HEAD as of 30.06.2021
+panko_git_track_branch: master
 
 
 ## Placement service
 placement_git_repo: https://opendev.org/openstack/placement
-placement_git_install_branch: adf525a8f176fe37222d08478c9fe08db823db98 # HEAD as of 26.06.2021
-placement_git_track_branch: stable/wallaby
+placement_git_install_branch: f77a7f9928d1156450c48045c48597b2feec9cc1 # HEAD as of 30.06.2021
+placement_git_track_branch: master
 
 
 ## Tacker service
 tacker_git_repo: https://opendev.org/openstack/tacker
-tacker_git_install_branch: 098370444733c035a4092ef89eea13594fecd2a3 # HEAD as of 26.06.2021
-tacker_git_track_branch: stable/wallaby
+tacker_git_install_branch: 8e79746b2819c87ee0dc1654f3478728a1aacad1 # HEAD as of 30.06.2021
+tacker_git_track_branch: master
 
 
 ## Horizon Octavia dashboard plugin
 octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard
-octavia_dashboard_git_install_branch: ccb8bcbd17ef4b874c4597c337f3f42ba6cc7668 # HEAD as of 26.06.2021
-octavia_dashboard_git_track_branch: stable/wallaby
+octavia_dashboard_git_install_branch: 90246aaece31f735143067913f2e43525a24c710 # HEAD as of 30.06.2021
+octavia_dashboard_git_track_branch: master
 
 
 ## Blazar service
 blazar_git_repo: https://opendev.org/openstack/blazar
-blazar_git_install_branch: 43587aa53efdeb8a978a8c4408ec61ff7db6287f # HEAD as of 26.06.2021
-blazar_git_track_branch: stable/wallaby
+blazar_git_install_branch: 63d94170b59937995247ff8443a3303e5288d304 # HEAD as of 30.06.2021
+blazar_git_track_branch: master
 
 ## Blazar Nova Service
 blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova
-blazar_nova_git_install_branch: c71d01e3955a5904d1f557840285292422cbefe6 # HEAD as of 26.06.2021
-blazar_nova_git_track_branch: stable/wallaby
+blazar_nova_git_install_branch: 5f7bd6eea5f737f2bfbfea7d114f8e4ee99c04d2 # HEAD as of 30.06.2021
+blazar_nova_git_track_branch: master
 
 ## Zun service
 zun_git_repo: https://opendev.org/openstack/zun
-zun_git_install_branch: 12685be9b4947d856a405fd059f0fe15aa957512 # HEAD as of 26.06.2021
-zun_git_track_branch: stable/wallaby
+zun_git_install_branch: 52a35609b0a91857d1119a03c2882e4cd28cf52d # HEAD as of 30.06.2021
+zun_git_track_branch: master
 
 ## Zun kuryr service
 zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork
-zun_kuryr_git_install_branch: 2d4cf6435e7878d11e5bcdb280c841dd8aabaf64 # HEAD as of 26.06.2021
-zun_kuryr_git_track_branch: stable/wallaby
+zun_kuryr_git_install_branch: dbb7a4dff64326d547243ce092d5064a13bfabb0 # HEAD as of 30.06.2021
+zun_kuryr_git_track_branch: master
 
 ## Zun kuryr library
 zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr
-zun_kuryr_lib_git_install_branch: 18590ef0a13d3bc9bb1f0759dfd1ce6a16079507 # HEAD as of 26.06.2021
-zun_kuryr_lib_git_track_branch: stable/wallaby
+zun_kuryr_lib_git_install_branch: 764de32607059a9a1a0bd37c46609815a1abe1ba # HEAD as of 30.06.2021
+zun_kuryr_lib_git_track_branch: master
diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml
new file mode 100644
index 0000000000..b667b9a23c
--- /dev/null
+++ b/playbooks/defaults/repo_packages/openstack_testing.yml
@@ -0,0 +1,22 @@
+---
+# Copyright 2018, Jean-Philippe Evrard <jean-philippe@evrard.me>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# TODO(evrardjp): Remove this file from stable branches to allow the latest tempest
+# release to be used instead, when a PyPI published version of tempest contains
+# https://github.com/openstack/tempest/commit/7d2b636a30057ed8db8cfd4fe2248f509b3570f1#diff-5c9acbc10dc9d27b47985cd74ab100f6
+tempest_git_repo: https://opendev.org/openstack/tempest
+tempest_git_install_branch: 5dcdd41ddafa2e455ab0dd0ce0b1d3f3e32caa04  # HEAD as of 30.06.2021
+tempest_git_project_group: utility_all
+tempest_git_track_branch: master
diff --git a/playbooks/os-tempest-install.yml b/playbooks/os-tempest-install.yml
index 11a4bfc5f3..c227a9b532 100644
--- a/playbooks/os-tempest-install.yml
+++ b/playbooks/os-tempest-install.yml
@@ -25,6 +25,7 @@
   user: root
   vars_files:
     - "defaults/repo_packages/openstack_services.yml"
+    - "defaults/repo_packages/openstack_testing.yml"
     - "defaults/{{ install_method }}_install.yml"
   pre_tasks:
     - name: End playbook
diff --git a/scripts/gate-check-commit.sh b/scripts/gate-check-commit.sh
index 0fbd39147a..2e8b2bf53c 100755
--- a/scripts/gate-check-commit.sh
+++ b/scripts/gate-check-commit.sh
@@ -49,7 +49,7 @@ export INSTALL_METHOD=${3:-"source"}
 # Set the source branch for upgrade tests
 # Be sure to change this whenever a new stable branch
 # is created. The checkout must always be N-1.
-export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/victoria'}
+export UPGRADE_SOURCE_BRANCH=${UPGRADE_SOURCE_BRANCH:-'stable/wallaby'}
 
 # enable the ARA callback plugin
 export SETUP_ARA=${SETUP_ARA:-true}
diff --git a/scripts/run-upgrade.sh b/scripts/run-upgrade.sh
index 718077fc74..67759dd96f 100755
--- a/scripts/run-upgrade.sh
+++ b/scripts/run-upgrade.sh
@@ -31,10 +31,10 @@ export SCRIPTS_PATH="$(dirname "$(readlink -f "${0}")")"
 export MAIN_PATH="$(dirname "${SCRIPTS_PATH}")"
 
 # The expected source series name
-export SOURCE_SERIES="victoria"
+export SOURCE_SERIES="wallaby"
 
 # The expected target series name
-export TARGET_SERIES="wallaby"
+export TARGET_SERIES="xena"
 
 ## Functions -----------------------------------------------------------------