diff --git a/playbooks/defaults/repo_packages/gnocchi.yml b/playbooks/defaults/repo_packages/gnocchi.yml
index 738abc278b..cab3c0e6b9 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 19.04.2021
+gnocchi_git_install_branch: 350fdf98d886103ac12017280efe7c08964d8136  # HEAD as of 09.05.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 d5ea54a5d2..dddba63188 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: ae5f3f6909f1263c7a375f841ce685aa95224b60 # HEAD as of 19.04.2021
+novncproxy_git_install_branch: dd20b17d49a2394b586175f870e00b4b64c2817d # HEAD as of 09.05.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 19.04.2021
+spicehtml5_git_install_branch: 56ddb3005e39a9e76670fec9676e667d44167bf3 # HEAD as of 09.05.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 b7de82ac06..cc257f744f 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: 3c229c7c5d81a552ef4a34d989426fb715c822e9 # HEAD as of 19.04.2021
+requirements_git_install_branch: 04f031f09372d4e4a15b684a7718f22c3dfb4dd4 # HEAD as of 09.05.2021
 requirements_git_track_branch: stable/wallaby
 
 ## Adjutant service
 adjutant_git_repo: https://opendev.org/openstack/adjutant
-adjutant_git_install_branch: ad19ed13b65b583e65b5a19e04a0f0403c366b09 # HEAD as of 19.04.2021
+adjutant_git_install_branch: ad19ed13b65b583e65b5a19e04a0f0403c366b09 # HEAD as of 09.05.2021
 adjutant_git_track_branch: stable/wallaby
 
 ## Adjutant dashboard plugin
 adjutant_dashboard_git_repo: https://opendev.org/openstack/adjutant-ui
-adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393 # HEAD as of 19.04.2021
+adjutant_dashboard_git_install_branch: 104c474479e9a89d22b96777378ff59983c03393 # HEAD as of 09.05.2021
 adjutant_dashboard_git_track_branch: stable/wallaby
 
 ## Aodh service
 aodh_git_repo: https://opendev.org/openstack/aodh
-aodh_git_install_branch: 1fb8cde66b81c6e138749956824c7676ba6073a7 # HEAD as of 19.04.2021
+aodh_git_install_branch: 1fb8cde66b81c6e138749956824c7676ba6073a7 # HEAD as of 09.05.2021
 aodh_git_track_branch: stable/wallaby
 
 
 ## Barbican service
 barbican_git_repo: https://opendev.org/openstack/barbican
-barbican_git_install_branch: c8d3c580143282935de36e4a5a1708ee9242f7be # HEAD as of 19.04.2021
+barbican_git_install_branch: c8d3c580143282935de36e4a5a1708ee9242f7be # HEAD as of 09.05.2021
 barbican_git_track_branch: stable/wallaby
 
 
 ## Barbican dashboard plugin
 barbican_dashboard_git_repo: https://opendev.org/openstack/barbican-ui
-barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271 # HEAD as of 19.04.2021
+barbican_dashboard_git_install_branch: 3a78a743426376250f43508d4281e86c75067271 # HEAD as of 09.05.2021
 barbican_dashboard_git_track_branch: master
 
 
 ## Ceilometer service
 ceilometer_git_repo: https://opendev.org/openstack/ceilometer
-ceilometer_git_install_branch: eeffd902d1e2366b7e796dfe418961aa46aaae6d # HEAD as of 19.04.2021
+ceilometer_git_install_branch: eeffd902d1e2366b7e796dfe418961aa46aaae6d # HEAD as of 09.05.2021
 ceilometer_git_track_branch: stable/wallaby
 
 
 ## Cinder service
 cinder_git_repo: https://opendev.org/openstack/cinder
-cinder_git_install_branch: e7f145bc8c557a787370d5a6670280545e6755a8 # HEAD as of 19.04.2021
+cinder_git_install_branch: 8dd2a8166e0e5bfccc455226386e97de6233f5cf # HEAD as of 13.05.2021
 cinder_git_track_branch: stable/wallaby
 
 
 ## Cloudkitty service
 cloudkitty_git_repo: https://opendev.org/openstack/cloudkitty
-cloudkitty_git_install_branch: 3bf565997f3dc315cbcc37f6c8240e6253f6bb48 # HEAD as of 26.03.2021
+cloudkitty_git_install_branch: 3b515db38ad4c0a633e9a5538b1fbaf645e10df3 # HEAD as of 09.05.2021
 cloudkitty_git_track_branch: master
 
 
 ## Cloudkitty dashboard plugin
 cloudkitty_dashboard_git_repo: https://opendev.org/openstack/cloudkitty-dashboard
-cloudkitty_dashboard_git_install_branch: 4e166ded43d51dd2baf0d13bbe88c1333b1a5d22 # HEAD as of 29.03.2021
+cloudkitty_dashboard_git_install_branch: 19ead1f0723845a7ebee511dace691da5f28c268 # HEAD as of 09.05.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 19.04.2021
+designate_git_install_branch: d7cd95847a04a74ccce58bd7fd52fde5ecd52c21 # HEAD as of 09.05.2021
 designate_git_track_branch: stable/wallaby
 
 
 ## Horizon Designate dashboard plugin
 designate_dashboard_git_repo: https://opendev.org/openstack/designate-dashboard
-designate_dashboard_git_install_branch: a65ea0165cd5b511ed23c36382b1a29d8d41df6d # HEAD as of 19.04.2021
+designate_dashboard_git_install_branch: a65ea0165cd5b511ed23c36382b1a29d8d41df6d # HEAD as of 09.05.2021
 designate_dashboard_git_track_branch: stable/wallaby
 
 
 ## Glance service
 glance_git_repo: https://opendev.org/openstack/glance
-glance_git_install_branch: b5437773b20db3d6ef20d449a8a43171c8fc7f69 # HEAD as of 19.04.2021
+glance_git_install_branch: b5437773b20db3d6ef20d449a8a43171c8fc7f69 # HEAD as of 09.05.2021
 glance_git_track_branch: stable/wallaby
 
 
 ## Heat service
 heat_git_repo: https://opendev.org/openstack/heat
-heat_git_install_branch: 28b78eb971b69616c0a560930c72d75e525d34c9 # HEAD as of 19.04.2021
+heat_git_install_branch: 7b9ffc5bed4555a8eb26b954d454aa172773417a # HEAD as of 09.05.2021
 heat_git_track_branch: stable/wallaby
 
 ## Horizon Heat dashboard plugin
 heat_dashboard_git_repo: https://opendev.org/openstack/heat-dashboard
-heat_dashboard_git_install_branch: cd889e6146ca11c70cd2a020a66547b270bf2660 # HEAD as of 19.04.2021
+heat_dashboard_git_install_branch: cd889e6146ca11c70cd2a020a66547b270bf2660 # HEAD as of 09.05.2021
 heat_dashboard_git_track_branch: stable/wallaby
 
 ## Horizon service
 horizon_git_repo: https://opendev.org/openstack/horizon
-horizon_git_install_branch: 7216fc2a19278cff26bf435bf450b0f39796a937 # HEAD as of 19.04.2021
+horizon_git_install_branch: 6745c8c62b246714fcda2bd65eacb3f9e95541c6 # HEAD as of 09.05.2021
 horizon_git_track_branch: stable/wallaby
 
 ## Horizon Ironic dashboard plugin
 ironic_dashboard_git_repo: https://opendev.org/openstack/ironic-ui
-ironic_dashboard_git_install_branch: 98f31e49e2c916bc56baaaffe717ca3ab7adce87 # HEAD as of 19.04.2021
+ironic_dashboard_git_install_branch: 98f31e49e2c916bc56baaaffe717ca3ab7adce87 # HEAD as of 09.05.2021
 ironic_dashboard_git_track_branch: stable/wallaby
 
 ## Horizon Magnum dashboard plugin
 magnum_dashboard_git_repo: https://opendev.org/openstack/magnum-ui
-magnum_dashboard_git_install_branch: 8458e8b6bff1ec1e3c8f6d9aef3dac85db5f1a27 # HEAD as of 19.04.2021
+magnum_dashboard_git_install_branch: 8458e8b6bff1ec1e3c8f6d9aef3dac85db5f1a27 # HEAD as of 09.05.2021
 magnum_dashboard_git_track_branch: stable/wallaby
 
 ## Horizon Masakari dashboard plugin
 masakari_dashboard_git_repo: https://opendev.org/openstack/masakari-dashboard
-masakari_dashboard_git_install_branch: b14c036daa7ee109c864922cee0ac08a5f2f66a8 # HEAD as of 19.04.2021
+masakari_dashboard_git_install_branch: b14c036daa7ee109c864922cee0ac08a5f2f66a8 # HEAD as of 09.05.2021
 masakari_dashboard_git_track_branch: stable/wallaby
 
 
 ## Horizon Sahara dashboard plugin
 sahara_dashboard_git_repo: https://opendev.org/openstack/sahara-dashboard
-sahara_dashboard_git_install_branch: 211f92dc453b37f8c2f9245b19e345e881cf4b95 # HEAD as of 19.04.2021
+sahara_dashboard_git_install_branch: 211f92dc453b37f8c2f9245b19e345e881cf4b95 # HEAD as of 09.05.2021
 sahara_dashboard_git_track_branch: stable/wallaby
 
 
 ## Keystone service
 keystone_git_repo: https://opendev.org/openstack/keystone
-keystone_git_install_branch: f47e635b8041542faa05e64606e66d2fbbc5f284 # HEAD as of 19.04.2021
+keystone_git_install_branch: f47e635b8041542faa05e64606e66d2fbbc5f284 # HEAD as of 09.05.2021
 keystone_git_track_branch: stable/wallaby
 
 
 ## Manila service
 manila_git_repo: https://opendev.org/openstack/manila
-manila_git_install_branch: 9a9a2c2467fd167bd3277c911357569ef3cdb20d # HEAD as of 22.04.2021
+manila_git_install_branch: 8de6a20379e1bc7e3e1f4ddfb0f95dc56254849f # HEAD as of 09.05.2021
 manila_git_track_branch: stable/wallaby
 
 
 ## Neutron service
 neutron_git_repo: https://opendev.org/openstack/neutron
-neutron_git_install_branch: b21062d313d22681b519cf83ee6eb5c12394b97b # HEAD as of 19.04.2021
+neutron_git_install_branch: 45ea14db990f0fa5e403dee11a972f8f69c4bea2 # HEAD as of 09.05.2021
 neutron_git_track_branch: stable/wallaby
 
 neutron_vpnaas_git_repo: https://opendev.org/openstack/neutron-vpnaas
-neutron_vpnaas_git_install_branch: 2cf3451517c09dc998bc7e3e194916601a728c03 # HEAD as of 19.04.2021
+neutron_vpnaas_git_install_branch: 2cf3451517c09dc998bc7e3e194916601a728c03 # HEAD as of 09.05.2021
 neutron_vpnaas_git_track_branch: stable/wallaby
 
 
 neutron_dynamic_routing_git_repo: https://opendev.org/openstack/neutron-dynamic-routing
-neutron_dynamic_routing_git_install_branch: cf256fa24d03022936c50feba513de4256ff48de # HEAD as of 19.04.2021
+neutron_dynamic_routing_git_install_branch: cf256fa24d03022936c50feba513de4256ff48de # HEAD as of 09.05.2021
 neutron_dynamic_routing_git_track_branch: stable/wallaby
 
 # Networking calico follows master
 networking_calico_git_repo: https://github.com/projectcalico/networking-calico
-networking_calico_git_install_branch: ff42aafb57b1a249f59356c2ed61b52762319b18 # HEAD as of 19.04.2021
+networking_calico_git_install_branch: ff42aafb57b1a249f59356c2ed61b52762319b18 # HEAD as of 09.05.2021
 networking_calico_git_track_branch: release-v3.18
 
 networking_odl_git_repo: https://opendev.org/openstack/networking-odl
-networking_odl_git_install_branch: b377b3aa527a87f415f1a6a59362229f99855802 # HEAD as of 19.04.2021
+networking_odl_git_install_branch: b377b3aa527a87f415f1a6a59362229f99855802 # HEAD as of 09.05.2021
 networking_odl_git_track_branch: stable/wallaby
 
 networking_bgpvpn_git_repo: https://opendev.org/openstack/networking-bgpvpn
-networking_bgpvpn_git_install_branch: a1d47de389c65687b498603d33e82b80845dbb4e # HEAD as of 19.04.2021
+networking_bgpvpn_git_install_branch: 2d4dcc8b1b5cf4bc5a68261045aad0c02fcb8185 # HEAD as of 09.05.2021
 networking_bgpvpn_git_track_branch: stable/wallaby
 
 networking_sfc_git_repo: https://opendev.org/openstack/networking-sfc
-networking_sfc_git_install_branch: ac95c440664130ae6c690333d020c6a6f2daa637 # HEAD as of 19.04.2021
+networking_sfc_git_install_branch: 71d44504dab4eac9c802db6962c10b956f52ffb1 # HEAD as of 09.05.2021
 networking_sfc_git_track_branch: stable/wallaby
 
 networking_generic_switch_git_repo: https://opendev.org/openstack/networking-generic-switch
-networking_generic_switch_git_install_branch: 9399c69d524be0ccad33878488028cc6c183cf07 # HEAD as of 19.04.2021
+networking_generic_switch_git_install_branch: 9dc003025bb8d2f1a73264acb1fcc7260a98d22c # HEAD as of 09.05.2021
 networking_generic_switch_git_track_branch: stable/wallaby
 
 networking_nsx_git_repo: https://opendev.org/x/vmware-nsx
-networking_nsx_git_install_branch: b368dcbc03a0df96b8acc4cf760ec51772b0fc0b # HEAD as of 19.04.2021
+networking_nsx_git_install_branch: 8947b35ee70670ebfbca431f742976a32fc022e1 # HEAD as of 09.05.2021
 networking_nsx_git_track_branch: master
 
 networking_nsxlib_git_repo: https://opendev.org/x/vmware-nsxlib
-networking_nsxlib_git_install_branch: 287757d4cd8607e1c257327da891e43532c35d42 # HEAD as of 19.04.2021
+networking_nsxlib_git_install_branch: d8596e784e6e6f641c6d195de8cbd7f5af0408fc # HEAD as of 09.05.2021
 networking_nsxlib_git_track_branch: master
 
 ## Nova service
 nova_git_repo: https://opendev.org/openstack/nova
-nova_git_install_branch: 68af588d5c7b5c9472cbc2731fee2956c86206ea # HEAD as of 19.04.2021
+nova_git_install_branch: a5ce4d806172f9d144633f297163e088c8ed1491 # HEAD as of 09.05.2021
 nova_git_track_branch: stable/wallaby
 
 
 ## Sahara service
 sahara_git_repo: https://opendev.org/openstack/sahara
-sahara_git_install_branch: 452affc54ba98031d0b75d61ed91329364e79c97 # HEAD as of 19.04.2021
+sahara_git_install_branch: 452affc54ba98031d0b75d61ed91329364e79c97 # HEAD as of 09.05.2021
 sahara_git_track_branch: stable/wallaby
 
 
 ## Senlin service
 senlin_git_repo: https://opendev.org/openstack/senlin
-senlin_git_install_branch: c7842da4cf357faab343f0974e37dda448364ce4 # HEAD as of 19.04.2021
+senlin_git_install_branch: c7842da4cf357faab343f0974e37dda448364ce4 # HEAD as of 09.05.2021
 senlin_git_track_branch: stable/wallaby
 
 
 ## Swift service
 swift_git_repo: https://opendev.org/openstack/swift
-swift_git_install_branch: 1b436a65dca341cf7b7f082db5f8cfeedcb2c36d # HEAD as of 19.04.2021
+swift_git_install_branch: 1b436a65dca341cf7b7f082db5f8cfeedcb2c36d # HEAD as of 09.05.2021
 swift_git_track_branch: stable/wallaby
 
 
 ## Ironic service
 ironic_git_repo: https://opendev.org/openstack/ironic
-ironic_git_install_branch: 868b3aefe103e61992097f967cbeee55588347fe # HEAD as of 19.04.2021
+ironic_git_install_branch: 659eef72ee59fdeb639577c8499406f59644a433 # HEAD as of 09.05.2021
 ironic_git_track_branch: stable/wallaby
 
 
 ## Ironic inspector service
 ironic_inspector_git_repo: https://opendev.org/openstack/ironic-inspector
-ironic_inspector_git_install_branch: 579f59ca63eee744c90ca13d83ef8f36fb29c841 # HEAD as of 19.04.2021
+ironic_inspector_git_install_branch: 579f59ca63eee744c90ca13d83ef8f36fb29c841 # HEAD as of 09.05.2021
 ironic_inspector_git_track_branch: stable/wallaby
 
 
 ## Magnum service
 magnum_git_repo: https://opendev.org/openstack/magnum
-magnum_git_install_branch: 2bb758846b6e1fafe3ef77785a1f890365450c37 # HEAD as of 19.04.2021
+magnum_git_install_branch: 6a42e1246fcafa9b0ab50bce27189beade14c464 # HEAD as of 09.05.2021
 magnum_git_track_branch: stable/wallaby
 
 ## Masakari service
 masakari_git_repo: https://opendev.org/openstack/masakari
-masakari_git_install_branch: c366cdeb3835364dd54199a83f78175f646f0d9b # HEAD as of 19.04.2021
+masakari_git_install_branch: c366cdeb3835364dd54199a83f78175f646f0d9b # HEAD as of 09.05.2021
 masakari_git_track_branch: stable/wallaby
 
 ## Masakari monitors services
 masakari_monitors_git_repo: https://opendev.org/openstack/masakari-monitors
-masakari_monitors_git_install_branch: 019af1c0bc68f87187258f9e22bf3e7ce13b21ca # HEAD as of 19.04.2021
+masakari_monitors_git_install_branch: 019af1c0bc68f87187258f9e22bf3e7ce13b21ca # HEAD as of 09.05.2021
 masakari_monitors_git_track_branch: stable/wallaby
 
 ## Mistral service
 mistral_git_repo: https://opendev.org/openstack/mistral
-mistral_git_install_branch: 1c70aa02b54736c3c571667405a640cd6fb293fc # HEAD as of 19.04.2021
+mistral_git_install_branch: c2a0205d56642ad920d94953079c98e17c7b3536 # HEAD as of 09.05.2021
 mistral_git_track_branch: stable/wallaby
 
 ## Murano service
 murano_git_repo: https://opendev.org/openstack/murano
-murano_git_install_branch: 2b3a4f3117d437cd832f010218acf466a8321763 # HEAD as of 19.04.2021
+murano_git_install_branch: 2b3a4f3117d437cd832f010218acf466a8321763 # HEAD as of 09.05.2021
 murano_git_track_branch: stable/wallaby
 
 murano_dashboard_git_repo: https://opendev.org/openstack/murano-dashboard
-murano_dashboard_git_install_branch: c01fbfcaeabd74f2a6b5edbe07c7d9d7515a9dea # HEAD as of 19.04.2021
+murano_dashboard_git_install_branch: c01fbfcaeabd74f2a6b5edbe07c7d9d7515a9dea # HEAD as of 09.05.2021
 murano_dashboard_git_track_branch: stable/wallaby
 
 ## Trove service
 trove_git_repo: https://opendev.org/openstack/trove
-trove_git_install_branch: ad3d3b7b2f8e242686229b094b36f47593146734 # HEAD as of 19.04.2021
+trove_git_install_branch: 698c715af847b453c9595173c4601dd14ef57fb4 # HEAD as of 09.05.2021
 trove_git_track_branch: stable/wallaby
 
 ## Horizon Trove dashboard plugin
 trove_dashboard_git_repo: https://opendev.org/openstack/trove-dashboard
-trove_dashboard_git_install_branch: 7c0cdbd87da228879be58760a5362f226b0eba92 # HEAD as of 19.04.2021
+trove_dashboard_git_install_branch: c3f0c85ed1fa8b9bb2d2110d8697db797a92d85e # HEAD as of 09.05.2021
 trove_dashboard_git_track_branch: stable/wallaby
 
 
 ## Octavia service
 octavia_git_repo: https://opendev.org/openstack/octavia
-octavia_git_install_branch: d9603b3d21723fce3b7380b14d537d847088246c # HEAD as of 19.04.2021
+octavia_git_install_branch: 46979a0d1b92647913f693ee5b4d8e4b81473e7e # HEAD as of 09.05.2021
 octavia_git_track_branch: stable/wallaby
 
 
 ## Panko service
 panko_git_repo: https://opendev.org/openstack/panko
-panko_git_install_branch: 276d891675c692c146448180767f97362871b493 # HEAD as of 19.04.2021
+panko_git_install_branch: 276d891675c692c146448180767f97362871b493 # HEAD as of 09.05.2021
 panko_git_track_branch: stable/wallaby
 
 
 ## Placement service
 placement_git_repo: https://opendev.org/openstack/placement
-placement_git_install_branch: 6bb8ff5b7e65b5dc220bbeb46fbcd20f8ee0ddd2 # HEAD as of 19.04.2021
+placement_git_install_branch: adf525a8f176fe37222d08478c9fe08db823db98 # HEAD as of 09.05.2021
 placement_git_track_branch: stable/wallaby
 
 
 ## Tacker service
 tacker_git_repo: https://opendev.org/openstack/tacker
-tacker_git_install_branch: 098370444733c035a4092ef89eea13594fecd2a3 # HEAD as of 19.04.2021
+tacker_git_install_branch: 098370444733c035a4092ef89eea13594fecd2a3 # HEAD as of 09.05.2021
 tacker_git_track_branch: stable/wallaby
 
 
 ## Horizon Octavia dashboard plugin
 octavia_dashboard_git_repo: https://opendev.org/openstack/octavia-dashboard
-octavia_dashboard_git_install_branch: e6eea213de1ee3d9c3b43778e6496b85f638d099 # HEAD as of 19.04.2021
+octavia_dashboard_git_install_branch: e6eea213de1ee3d9c3b43778e6496b85f638d099 # HEAD as of 09.05.2021
 octavia_dashboard_git_track_branch: stable/wallaby
 
 
 ## Blazar service
 blazar_git_repo: https://opendev.org/openstack/blazar
-blazar_git_install_branch: d3737b5dc9bd0dd25ebe75488a5563455123af83 # HEAD as of 19.04.2021
+blazar_git_install_branch: d3737b5dc9bd0dd25ebe75488a5563455123af83 # HEAD as of 09.05.2021
 blazar_git_track_branch: stable/wallaby
 
 ## Blazar Nova Service
 blazar_nova_git_repo: https://opendev.org/openstack/blazar-nova
-blazar_nova_git_install_branch: c71d01e3955a5904d1f557840285292422cbefe6 # HEAD as of 19.04.2021
+blazar_nova_git_install_branch: c71d01e3955a5904d1f557840285292422cbefe6 # HEAD as of 09.05.2021
 blazar_nova_git_track_branch: stable/wallaby
 
 ## Zun service
 zun_git_repo: https://opendev.org/openstack/zun
-zun_git_install_branch: 12685be9b4947d856a405fd059f0fe15aa957512 # HEAD as of 19.04.2021
+zun_git_install_branch: 12685be9b4947d856a405fd059f0fe15aa957512 # HEAD as of 09.05.2021
 zun_git_track_branch: stable/wallaby
 
 ## Zun kuryr service
 zun_kuryr_git_repo: https://opendev.org/openstack/kuryr-libnetwork
-zun_kuryr_git_install_branch: 2d4cf6435e7878d11e5bcdb280c841dd8aabaf64 # HEAD as of 19.04.2021
+zun_kuryr_git_install_branch: 2d4cf6435e7878d11e5bcdb280c841dd8aabaf64 # HEAD as of 09.05.2021
 zun_kuryr_git_track_branch: stable/wallaby
 
 ## Zun kuryr library
 zun_kuryr_lib_git_repo: https://opendev.org/openstack/kuryr
-zun_kuryr_lib_git_install_branch: 18590ef0a13d3bc9bb1f0759dfd1ce6a16079507 # HEAD as of 19.04.2021
+zun_kuryr_lib_git_install_branch: 18590ef0a13d3bc9bb1f0759dfd1ce6a16079507 # HEAD as of 09.05.2021
 zun_kuryr_lib_git_track_branch: stable/wallaby
diff --git a/playbooks/defaults/repo_packages/openstack_testing.yml b/playbooks/defaults/repo_packages/openstack_testing.yml
index 092004c69a..a11daa9e2d 100644
--- a/playbooks/defaults/repo_packages/openstack_testing.yml
+++ b/playbooks/defaults/repo_packages/openstack_testing.yml
@@ -17,6 +17,6 @@
 # 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: 4d14a22a1a0eb7aaa4aafb917273baa0739f55c3  # HEAD as of 19.04.2021
+tempest_git_install_branch: 1053ecca53c413eb7cc5e7105f12911b7ad41776  # HEAD as of 09.05.2021
 tempest_git_project_group: utility_all
 tempest_git_track_branch: master
diff --git a/releasenotes/notes/add-encryption-support-79e8218926995864.yaml b/releasenotes/notes/add-encryption-support-79e8218926995864.yaml
new file mode 100644
index 0000000000..c49a8be4ff
--- /dev/null
+++ b/releasenotes/notes/add-encryption-support-79e8218926995864.yaml
@@ -0,0 +1,15 @@
+---
+features:
+  - |
+    Add support for encryption of databases. This is disabled by default and
+    can be enabled by setting ``galera_mariadb_encryption_enabled`` to ``true``.
+    For now only the ``file_key_management`` encryption plugin is supported.
+    You can override enryption options with ``galera_encryption_overrides``.
+    The role creates ``galera_db_encryption_keys`` for you, if they're not specified.
+    To specify your on encryption keys, provide them like this.
+
+    .. code-block:: yaml
+
+        galera_db_encryption_keys: |
+           1;5bbc03648be8db3d2087815717eabdec9fbc310f2b7fd53705b36fbdc80333e3
+           2;5bbc03648be8db3d2087815717eabdec9fbc310f2b7fd53705b36ebdc80333e3
diff --git a/releasenotes/notes/galera_upgrade_bug-88faad86f94d4f26.yaml b/releasenotes/notes/galera_upgrade_bug-88faad86f94d4f26.yaml
new file mode 100644
index 0000000000..3c5b0ed43e
--- /dev/null
+++ b/releasenotes/notes/galera_upgrade_bug-88faad86f94d4f26.yaml
@@ -0,0 +1,7 @@
+---
+upgrade:
+  - |
+    MariaDB version 10.5.9 is know to have `bug <https://jira.mariadb.org/browse/MDEV-25030?>`_
+    which results in broken root permissions after upgrade. We have implemented
+    a workarond for it which will be triggered automatically. This note
+    is informative only.
diff --git a/releasenotes/notes/horizon_websso_redirect-662cbf01b431efb1.yaml b/releasenotes/notes/horizon_websso_redirect-662cbf01b431efb1.yaml
new file mode 100644
index 0000000000..9b14527711
--- /dev/null
+++ b/releasenotes/notes/horizon_websso_redirect-662cbf01b431efb1.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Implemented horizon WEBSSO auto redirects. Following new variables
+    were added to manage redirects configuration:
+
+      - horizon_websso_default_redirect
+      - horizon_websso_default_redirect_region
+      - horizon_websso_default_redirect_logout
diff --git a/releasenotes/notes/lxc-image-local-build-c58b17050e343039.yaml b/releasenotes/notes/lxc-image-local-build-c58b17050e343039.yaml
new file mode 100644
index 0000000000..0451521466
--- /dev/null
+++ b/releasenotes/notes/lxc-image-local-build-c58b17050e343039.yaml
@@ -0,0 +1,11 @@
+---
+upgrade:
+  - |
+    All supported operating systems now build their LXC images locally on the
+    lxc container hosts rather than relying on external pre-built base images.
+    debootstrap and dnf are used on debian and Centos variants respectively.
+    All variables controlling the download of images have been removed from
+    the lxc_hosts role, and a new override, lxc_apt_mirror is added to allow
+    local mirrors to be specified for debootstrap. Centos systems will use
+    the mirror configuration already present on the host when building
+    the container rootfs with dnf.
diff --git a/releasenotes/notes/masakari_monitors_corosync-d61089311b03ade5.yaml b/releasenotes/notes/masakari_monitors_corosync-d61089311b03ade5.yaml
new file mode 100644
index 0000000000..3bce0ff4d7
--- /dev/null
+++ b/releasenotes/notes/masakari_monitors_corosync-d61089311b03ade5.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added variables ``masakari_monitor_corosync_multicast_ports`` and
+    ``masakari_monitor_corosync_ipmi_check`` that allow to define ports used
+    by corosync service and to enable IPMI checks in case ipmi RA is set in
+    pacemaker.
diff --git a/releasenotes/notes/nova_cell_templates-17775e06169ff926.yaml b/releasenotes/notes/nova_cell_templates-17775e06169ff926.yaml
new file mode 100644
index 0000000000..69fa74425a
--- /dev/null
+++ b/releasenotes/notes/nova_cell_templates-17775e06169ff926.yaml
@@ -0,0 +1,9 @@
+---
+upgrade:
+  - |
+    During upgrade your current Nova cell mapings will be converted to usage
+    of the `Template URLs <https://docs.openstack.org/nova/latest/user/cells.html#template-urls-in-cell-mappings>`_.
+    This means, that your changes of transport_url or [database]/connection
+    in ``nova.conf`` will be reflected by nova-conductor in cells just after
+    service restart, without need to explicitly run
+    ``nova-manage cell_v2 update_cell``.
diff --git a/releasenotes/notes/nova_console_agent-399170af9ccfa258.yaml b/releasenotes/notes/nova_console_agent-399170af9ccfa258.yaml
new file mode 100644
index 0000000000..899fff7386
--- /dev/null
+++ b/releasenotes/notes/nova_console_agent-399170af9ccfa258.yaml
@@ -0,0 +1,12 @@
+---
+deprecations:
+  - |
+    Variables ``nova_novncproxy_agent_enabled``,
+    ``nova_serialconsoleproxy_enabled`` and ``nova_console_agent_enabled``
+    are removed and won't have any effect in the future. If you want to
+    disable console functionality, set ``nova_console_type: disabled``
+    in your user_variables.yml
+fixes:
+  - |
+    Fixed behaviour of variable ``nova_spice_console_agent_enabled``. It can
+    be safely used now to disable spice agent when needed.
diff --git a/releasenotes/notes/nova_dhcp_domain-6e1d4192fb6c7909.yaml b/releasenotes/notes/nova_dhcp_domain-6e1d4192fb6c7909.yaml
new file mode 100644
index 0000000000..9f1cc90145
--- /dev/null
+++ b/releasenotes/notes/nova_dhcp_domain-6e1d4192fb6c7909.yaml
@@ -0,0 +1,7 @@
+---
+
+features:
+  - |
+    Re-added ``nova_dhcp_domain`` variable that defaults to the
+    ``dhcp_domain``. When set to empty string, only the hostname without
+    a domain will be configured for the instances.
diff --git a/releasenotes/notes/tcp_retries-bf32bab6e50fa97a.yaml b/releasenotes/notes/tcp_retries-bf32bab6e50fa97a.yaml
new file mode 100644
index 0000000000..312f510aa8
--- /dev/null
+++ b/releasenotes/notes/tcp_retries-bf32bab6e50fa97a.yaml
@@ -0,0 +1,9 @@
+---
+features:
+  - |
+    Added variable ``keepalived_sysctl_tcp_retries`` that allows to control
+    number of retries kernel will make to give up on connection. It controls
+    net.ipv4.tcp_retries2 sysctl setting which default value of which is 15.
+    Default value of ``keepalived_sysctl_tcp_retries`` is 8, so VIP failover
+    time will be ~1min. Setting ``keepalived_sysctl_tcp_retries`` to 0 will
+    remove mentioned sysctl setting.
diff --git a/releasenotes/notes/trove_image_upload-c289c73cd2ddacfb.yaml b/releasenotes/notes/trove_image_upload-c289c73cd2ddacfb.yaml
new file mode 100644
index 0000000000..fe626aca87
--- /dev/null
+++ b/releasenotes/notes/trove_image_upload-c289c73cd2ddacfb.yaml
@@ -0,0 +1,7 @@
+---
+features:
+  - |
+    Added guest image upload functionality into Trove role. In order to use
+    this functionality, you need to define ``trove_guestagent_images`` variable
+    which may contain list of images that are required for upload and set
+    required tags for them.
diff --git a/releasenotes/notes/trove_merge_config-f52eecb1e3501fd6.yaml b/releasenotes/notes/trove_merge_config-f52eecb1e3501fd6.yaml
new file mode 100644
index 0000000000..4c27b8e2ac
--- /dev/null
+++ b/releasenotes/notes/trove_merge_config-f52eecb1e3501fd6.yaml
@@ -0,0 +1,71 @@
+---
+features:
+  - |
+    Added variable ``trove_management_security_groups`` to set list of
+    security groups that will be set for management interface of Trove
+    guest instances.
+  - |
+    Added following variables to control endpoint types that trove will search
+    in the catalog:
+
+    - trove_service_endpoint_type
+    - trove_service_neutron_endpoint_type
+    - trove_service_cinder_endpoint_type
+    - trove_service_nova_endpoint_type
+    - trove_service_glance_endpoint_type
+    - trove_service_swift_endpoint_type
+    - trove_guest_endpoint_type
+
+  - |
+    Added following variables to control when to add specific service blocks
+    to the config file and enable support for these services:
+
+    - trove_swift_enabled
+    - trove_designate_enabled
+    - trove_cinder_enabled
+
+  - |
+    Added following variables to ease designate integration with trove:
+
+    - trove_dns_domain_name
+    - trove_dns_domain_id
+    - trove_notifications_designate
+
+  - |
+    Added Trove guest specific variables to be able to use standalone rabbitmq
+    along with defaulting behaviour to enable guests to use
+    ``trove_container_net_name`` for rabbitmq servers:
+
+    - trove_guest_oslomsg_rpc_hostgroup
+    - trove_guest_oslomsg_notify_hostgroup
+
+upgrade:
+  - |
+    Trove service specific config files, like ``trove-conductor.conf`` and
+    ``trove-taskmanager.conf``, were removed and all functionality was merged
+    to the ``trove.conf`` file. So you need to ensure, that all overriden
+    options are now placed for the trove.conf file.
+  - |
+    Default Trove service username has been changed from ``admin_trove_user``
+    to ``trove``. You might want to manually delete ``admin_trove_user``
+    after upgrade or override new default.
+  - |
+    Default Trove service project name has been changed from
+    ``trove_for_trove_usage`` to ``service``. You might want to manually delete
+    ``trove_for_trove_usage`` project after upgrade or override new default.
+deprecations:
+  - |
+    Variables ``trove_taskmanager_config_overrides`` and
+    ``trove_conductor_config_overrides`` were removed along with affected config
+    files. You should use ``trove_config_overrides`` to override trove
+    configuration.
+  - |
+    Removed variable ``trove_provider_ip_from_q`` and
+    ``trove_container_net_name``. If you need to change network which will be
+    used for guests inside trove containers, please use variables
+    ``trove_provider_network`` or ``trove_provider_net_iface``.
+  - |
+    Removed variables ``trove_admin_user_name`` and
+    ``trove_service_tenant_name``. Please use ``trove_service_user_name``
+    and ``trove_service_project_name`` correspondingly to manage username
+    and project name which will be used for auth in keystone.
diff --git a/releasenotes/notes/trove_service_subnet-011acf408754f6d9.yaml b/releasenotes/notes/trove_service_subnet-011acf408754f6d9.yaml
new file mode 100644
index 0000000000..747540d39c
--- /dev/null
+++ b/releasenotes/notes/trove_service_subnet-011acf408754f6d9.yaml
@@ -0,0 +1,10 @@
+---
+upgrade:
+  - |
+    Default value for ``trove_service_net_subnet_cidr`` has been changed from
+    "192.168.20.0/24" to "172.29.252.0/22". Along with that pool start and
+    pool end has changed as well, which is represented with variables
+    ``trove_service_net_allocation_pool_start`` and
+    ``trove_service_net_allocation_pool_end``.
+    Please, define these variables user_variables in case you used default
+    values in production endironments.
diff --git a/releasenotes/notes/zun_policy_overrides-bc4e5d658969f0c8.yaml b/releasenotes/notes/zun_policy_overrides-bc4e5d658969f0c8.yaml
new file mode 100644
index 0000000000..6ca19a1585
--- /dev/null
+++ b/releasenotes/notes/zun_policy_overrides-bc4e5d658969f0c8.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Added variable ``zun_policy_overrides`` that aims to allow deploying
+    policy.yaml file with provided overrides for Zun service.