diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml
index 06223d143c..eb8e8af54c 100644
--- a/ansible-collection-requirements.yml
+++ b/ansible-collection-requirements.yml
@@ -11,7 +11,7 @@ collections:
 - name: openstack.osa
   source: https://opendev.org/openstack/openstack-ansible-plugins
   type: git
-  version: 2794fd68da74859fcb31e5945b04aeb895626d21
+  version: 3665033c9c942b848ca740f3d182674855fd9212
 - name: community.general
   source: https://github.com/ansible-collections/community.general
   type: git
diff --git a/ansible-role-requirements.yml b/ansible-role-requirements.yml
index ad42c785e3..aac76f6710 100644
--- a/ansible-role-requirements.yml
+++ b/ansible-role-requirements.yml
@@ -2,337 +2,337 @@
 - name: ansible-hardening
   scm: git
   src: https://opendev.org/openstack/ansible-hardening
-  version: master
-  trackbranch: master
-  shallow_since: '2024-03-27'
+  version: 1c5580e6485843d49edcba0dda85d09345fe07e3
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: frrouting
   scm: git
   src: https://opendev.org/openstack/ansible-role-frrouting
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-02'
+  version: 8af8a9a0aecb683506ffff61440b7d03bc61f495
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: pki
   src: https://opendev.org/openstack/ansible-role-pki
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2023-10-24'
+  version: d084fe5cc465a6c938bebb8c67a73fff53d52679
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: python_venv_build
   src: https://opendev.org/openstack/ansible-role-python_venv_build
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2024-04-30'
+  version: c1ccf348ceb6cc61d34c81c27111f19b2201612e
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: qdrouterd
   scm: git
   src: https://opendev.org/openstack/ansible-role-qdrouterd
-  version: master
-  trackbranch: master
-  shallow_since: '2023-07-11'
+  version: 6db8b2c71d664cfea0e60198600c74a9930ac99b
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: systemd_mount
   src: https://opendev.org/openstack/ansible-role-systemd_mount
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2023-07-23'
+  version: c3b8f830a0a8a19bdfc7273efdef6052416ce001
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: systemd_networkd
   src: https://opendev.org/openstack/ansible-role-systemd_networkd
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2024-02-12'
+  version: ad62bd2799eacebd44edfc9d00bbc2c034e0b9c3
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: systemd_service
   src: https://opendev.org/openstack/ansible-role-systemd_service
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2023-12-06'
+  version: 88697e28783bea43c84607fe1727a8ca9e96c13f
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: uwsgi
   src: https://opendev.org/openstack/ansible-role-uwsgi
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-06'
+  version: c1b0b6d7baa55412f6ae2472a7949095cf30a395
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: zookeeper
   src: https://opendev.org/openstack/ansible-role-zookeeper
   scm: git
-  version: master
-  trackbranch: master
-  shallow_since: '2023-10-25'
+  version: 4ad8f8d2d389deb9fbff65fd8dd565f13a1625a5
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: apt_package_pinning
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
-  version: master
-  trackbranch: master
-  shallow_since: '2023-08-21'
+  version: 8ad24da652119ae7bc4e490299275fde6e7effb7
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: ceph_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-ceph_client
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-12'
+  version: bd5edda3f51cf73684ce84e0df93cf08490a6ae2
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: galera_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-galera_server
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-13'
+  version: 7c248a441cbd21744f94ff0a88a41bba1412cde0
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: haproxy_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-haproxy_server
-  version: master
-  trackbranch: master
-  shallow_since: '2024-04-09'
+  version: e589743829df1f0e6d24f3188768c6e40076b6f8
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: lxc_container_create
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
-  version: master
-  trackbranch: master
-  shallow_since: '2024-01-15'
+  version: c082c8bdaddc3e4665eb10572bc3c02abe414d1c
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: lxc_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
-  version: master
-  trackbranch: master
-  shallow_since: '2024-01-04'
+  version: 3725802c1a7ecbc5d63dc3a6963abd2ffc05e718
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: memcached_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-memcached_server
-  version: master
-  trackbranch: master
-  shallow_since: '2023-09-11'
+  version: 30a9aee8c624ebbcf5175c1bc876a96b1908fc1c
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: openstack_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-03'
+  version: efa59c4380b0cb319defc869e66580ae89a88a5d
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: openstack_openrc
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
-  version: master
-  trackbranch: master
-  shallow_since: '2023-07-11'
+  version: cb5172191c60693db217d961464b73d139716ae7
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_adjutant
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_adjutant
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-09'
+  version: f01eda88ee00098159b33234cf66c92f546666f6
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_aodh
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_aodh
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 1407655106ed1f611e7c7f411580f3e5117aecaf
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_barbican
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_barbican
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: c149eac9ef482f42894e902067500a9630783fe7
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_blazar
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_blazar
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 7c73bd99b45d0cdd57c311234535fb63ee1f0753
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_ceilometer
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-15'
+  version: 203ddf2c687afbc7d348983904b90ad458b343d5
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_cinder
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cinder
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-13'
+  version: 11e71dda88988d6dff17db3cbef2193829207c24
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_cloudkitty
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-09'
+  version: 59cedfa55f981d0162ee6e28808609caae59f490
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_designate
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_designate
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: e9b1657a9c7d1302a673a8ae8dcc53b0beaad7ba
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_glance
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_glance
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: e94c1124324c4b5eb21a3ff4043729b890533c87
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_gnocchi
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-02'
+  version: 7cce9921b400a65ddb7e8fc07d1753e2131246dd
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_heat
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_heat
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: ac13ba67b41b00acc499155d36f328bdda3ea96b
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_horizon
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_horizon
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 9614a44c68783f1d96e86ee635eb4d56ffb24434
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_ironic
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ironic
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-15'
+  version: c1ae180832de6b450c7f74901b1d943f2a12d63b
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_keystone
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_keystone
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 34dfc99559724f3deba959dc9c27d277d6d1a65d
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_magnum
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_magnum
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 8e9c485919aed8ca3b40ff00d6626654f2807408
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_manila
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_manila
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-09'
+  version: 1bf117029c2fd11a885e387eab0dd0a5f12b9fea
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_masakari
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_masakari
-  version: master
-  trackbranch: master
-  shallow_since: '2023-10-19'
+  version: d304eb2f4c37f0793cc827908df484be825e3183
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_mistral
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_mistral
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: bdd918543af39f36cf7e3d16779df985ea5b2231
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_neutron
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_neutron
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 10534310270341ee7fbdce7ed30e23d198eb0909
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_nova
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_nova
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 01ffe69597b475b2b6f3f046128fa5873f73bbbc
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_octavia
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_octavia
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: a5593c54a518ed90828318ea6ff60be3d30dafe8
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_placement
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_placement
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 0a8f3e75826b15ffdfb75822156dacb91dfa1d97
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_rally
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_rally
-  version: master
-  trackbranch: master
-  shallow_since: '2023-07-13'
+  version: 80fac9b3376c8e4fddd25345e89d1318c3986600
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_skyline
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_skyline
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: afeec40d818dc08e726725db5d1e373b1de5a6af
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_swift
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_swift
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: f0be5d7c1bc2af781b5b4b653bb06d28d6d6cf5b
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_tacker
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tacker
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-14'
+  version: 00211d3799a95d460b1bdaecaa896903df78c5bc
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_tempest
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tempest
-  version: master
-  trackbranch: master
-  shallow_since: '2024-02-11'
+  version: d7d7ded820e2cce3c33deb802199786f0e0603c9
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_trove
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_trove
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-15'
+  version: 71e3000c998438e22dbf5cade176aabfe0898083
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: os_zun
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_zun
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-09'
+  version: 733d3f40f4586a78b9d97fa9cc25dea5958fa9f5
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: rabbitmq_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
-  version: master
-  trackbranch: master
-  shallow_since: '2024-05-03'
+  version: b0fee214608a254821f7f3591a2be026cae691b6
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 - name: repo_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-repo_server
-  version: master
-  trackbranch: master
-  shallow_since: '2024-04-16'
+  version: 4acac02792610018524056da1dd7fc5bc421346d
+  trackbranch: stable/2024.1
+  shallow_since: '2024-06-03'
 # External dependencies
 - name: etcd
   scm: git
   src: https://github.com/noonedeadpunk/ansible-etcd
-  version: master
+  version: de3b061e954d3259e0a48e2e55878f598ef3a9c1
   trackbranch: master
   shallow_since: '2023-04-11'
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: master
+  version: a73191c2e49cc7ce1c4a17fd90ef460c76439e94
   trackbranch: master
   shallow_since: '2023-05-18'
 - name: pacemaker_corosync
   scm: git
   src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
-  version: master
+  version: 8218da4e0b0ea14aceae091782c83c588cc8139e
   trackbranch: master
   shallow_since: '2023-10-19'
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: master
+  version: f7f694b3dd4361e364dccb4ce94e6510727fca2f
   trackbranch: master
   shallow_since: '2021-03-31'
 - name: unbound
   scm: git
   src: https://github.com/noonedeadpunk/ansible-role-unbound
-  version: master
+  version: 26abb238925dec80707ef7e4b869b3c5e48d4f7b
   trackbranch: master
   shallow_since: '2023-02-09'
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: stable-7.0
+  version: 69a990392a94b59e1404eaeae7d6dfb5217ca71c
   trackbranch: stable-7.0
   shallow_since: '2024-05-15'
diff --git a/inventory/group_vars/blazar_all/source_git.yml b/inventory/group_vars/blazar_all/source_git.yml
index 901e85ea16..a87824a8d0 100644
--- a/inventory/group_vars/blazar_all/source_git.yml
+++ b/inventory/group_vars/blazar_all/source_git.yml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 25.03.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Blazar service
 blazar_git_repo: "{{ openstack_opendev_base_url }}/openstack/blazar"
-blazar_git_install_branch: 6e1276098e01f169541a89513031f881976ed451
+blazar_git_install_branch: c58f857f49936a4b58ad635e4bd665bb46ee5432
 blazar_git_track_branch: stable/2024.1
 
 ## Blazar Nova Service
diff --git a/inventory/group_vars/cinder_all/source_git.yml b/inventory/group_vars/cinder_all/source_git.yml
index 3eb5ff0c47..4e1bbcf44f 100644
--- a/inventory/group_vars/cinder_all/source_git.yml
+++ b/inventory/group_vars/cinder_all/source_git.yml
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Cinder service
 cinder_git_repo: "{{ openstack_opendev_base_url }}/openstack/cinder"
-cinder_git_install_branch: 1aa541d02445031945f06a58c77c6c3fb23909e6
+cinder_git_install_branch: 0ff4262fba803152e94e32e0dc8e4a2e56fcb0f5
 cinder_git_track_branch: stable/2024.1
diff --git a/inventory/group_vars/cloudkitty_all/source_git.yml b/inventory/group_vars/cloudkitty_all/source_git.yml
index f555f8cfd6..758c6c342d 100644
--- a/inventory/group_vars/cloudkitty_all/source_git.yml
+++ b/inventory/group_vars/cloudkitty_all/source_git.yml
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Cloudkitty service
 cloudkitty_git_repo: "{{ openstack_opendev_base_url }}/openstack/cloudkitty"
-cloudkitty_git_install_branch: fd0c6e1ab89b213566a7c43344eee104bdff26e3
+cloudkitty_git_install_branch: 6641acb738c9376a532ae4d886397bc93374522a
 cloudkitty_git_track_branch: stable/2024.1
diff --git a/inventory/group_vars/glance_all/source_git.yml b/inventory/group_vars/glance_all/source_git.yml
index e098561306..e01f7f264d 100644
--- a/inventory/group_vars/glance_all/source_git.yml
+++ b/inventory/group_vars/glance_all/source_git.yml
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Glance service
 glance_git_repo: "{{ openstack_opendev_base_url }}/openstack/glance"
-glance_git_install_branch: 99540a990fceca89d0e4e73493f4cc05dbd5441e
+glance_git_install_branch: eb3eb4ea269f608a7b534bb205f917309420cd51
 glance_git_track_branch: stable/2024.1
diff --git a/inventory/group_vars/heat_all/source_git.yml b/inventory/group_vars/heat_all/source_git.yml
index c556441c52..a941c485cf 100644
--- a/inventory/group_vars/heat_all/source_git.yml
+++ b/inventory/group_vars/heat_all/source_git.yml
@@ -13,9 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Heat service
 heat_git_repo: "{{ openstack_opendev_base_url }}/openstack/heat"
-heat_git_install_branch: b533b23a9a02b4b49a4c6dcaeb3ac6619603c7e2
+heat_git_install_branch: 512052a0553cc3661aa850542a13466b07a0c5c6
 heat_git_track_branch: stable/2024.1
diff --git a/inventory/group_vars/neutron_all/source_git.yml b/inventory/group_vars/neutron_all/source_git.yml
index 794151992d..353a3d3946 100644
--- a/inventory/group_vars/neutron_all/source_git.yml
+++ b/inventory/group_vars/neutron_all/source_git.yml
@@ -13,11 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Neutron service
 neutron_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron"
-neutron_git_install_branch: ac1472c8cffe64d32a012c73227595f2f7806de9
+neutron_git_install_branch: 97e4713bb3898f9bf2bf2365f60c16785560e9a2
 neutron_git_track_branch: stable/2024.1
 
 neutron_vpnaas_git_repo: "{{ openstack_opendev_base_url }}/openstack/neutron-vpnaas"
@@ -37,7 +37,7 @@ networking_sfc_git_install_branch: 69080506f2664c28068398d90b70df9e7332f256
 networking_sfc_git_track_branch: stable/2024.1
 
 networking_generic_switch_git_repo: "{{ openstack_opendev_base_url}}/openstack/networking-generic-switch"
-networking_generic_switch_git_install_branch: 7ed5628f9a5165da9ddc7989cfa30e1440d0ec0d
+networking_generic_switch_git_install_branch: b6bb46af9d56aae50e2afb17641289733f446a1b
 networking_generic_switch_git_track_branch: stable/2024.1
 
 networking_nsx_git_repo: "{{ openstack_opendev_base_url }}/x/vmware-nsx"
@@ -53,5 +53,5 @@ networking_baremetal_git_install_branch: 62ca32e80b77e23eb24d45d4a331ffddba3237c
 networking_baremetal_git_track_branch: stable/2024.1
 
 networking_ovn_bgp_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-bgp-agent"
-networking_ovn_bgp_git_install_branch: bd0d29c71fb84fc779f2c2f9d9ba9151d32c9a4a
+networking_ovn_bgp_git_install_branch: 47c18ffaa450e91ffb8b1e03fd67ba3d1b493d9a
 networking_ovn_bgp_git_track_branch: stable/2024.1
diff --git a/inventory/group_vars/nova_all/source_git.yml b/inventory/group_vars/nova_all/source_git.yml
index 0e289637f4..ce50bcb075 100644
--- a/inventory/group_vars/nova_all/source_git.yml
+++ b/inventory/group_vars/nova_all/source_git.yml
@@ -23,11 +23,11 @@
 ##   * All items with this file should be separated by `name_` note that the name of the
 ##     package should be one long name with no additional `_` separating it.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## NOVNC from source
 novncproxy_git_repo: "{{ openstack_github_base_url }}/novnc/noVNC"
-novncproxy_git_install_branch: d80e3bfa2f372e2b210f46b8c46796a9754abf27
+novncproxy_git_install_branch: aead0b2f891732687b970225350419ae62f1942c
 novncproxy_git_track_branch: master
 
 ## spice-html5 from source
diff --git a/inventory/group_vars/octavia_all/source_git.yml b/inventory/group_vars/octavia_all/source_git.yml
index 4a9f171b4b..fa24d74c4d 100644
--- a/inventory/group_vars/octavia_all/source_git.yml
+++ b/inventory/group_vars/octavia_all/source_git.yml
@@ -13,14 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Octavia service
 octavia_git_repo: "{{ openstack_opendev_base_url }}/openstack/octavia"
-octavia_git_install_branch: b370e46c1877fb8beada3ab6ee068d2e896cc743
+octavia_git_install_branch: b8053b207e40b7b7bd4c35d38969b18514afab5e
 octavia_git_track_branch: stable/2024.1
 
 ## Octavia OVN provider
 octavia_ovn_octavia_provider_git_repo: "{{ openstack_opendev_base_url }}/openstack/ovn-octavia-provider"
-octavia_ovn_octavia_provider_git_install_branch: c68129ce529b116f9fdab3c57d6f2f41f5dc91c3
+octavia_ovn_octavia_provider_git_install_branch: ad5f936ff7e29723bb3097ada71d6caf6add4494
 octavia_ovn_octavia_provider_git_track_branch: stable/2024.1
diff --git a/inventory/group_vars/skyline_all/source_git.yml b/inventory/group_vars/skyline_all/source_git.yml
index 8275e5c232..e91c0097ef 100644
--- a/inventory/group_vars/skyline_all/source_git.yml
+++ b/inventory/group_vars/skyline_all/source_git.yml
@@ -13,12 +13,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-### HEAD as of 17.05.2024 ###
+### HEAD as of 04.06.2024 ###
 
 ## Skyline service
 skyline_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-apiserver"
-skyline_git_install_branch: 42567b8b1ce90ed5da9d1dcd033f4d3981f2057f
-skyline_git_track_branch: master
+skyline_git_install_branch: b18edc14c0b2b5917fbad2b1d82117e005010272
+skyline_git_track_branch: stable/2024.1
 
 skyline_console_git_repo: "{{ openstack_opendev_base_url }}/openstack/skyline-console"
 skyline_console_git_install_branch: 4.0.0
diff --git a/releasenotes/notes/allow_to_skip_volume_types-8698ec60660a0510.yaml b/releasenotes/notes/allow_to_skip_volume_types-8698ec60660a0510.yaml
new file mode 100644
index 0000000000..66d001f533
--- /dev/null
+++ b/releasenotes/notes/allow_to_skip_volume_types-8698ec60660a0510.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Added variable ``cinder_manage_volume_types`` that allows to skip volume
+    type creation and management by os_cinder role.
diff --git a/releasenotes/notes/feature-flags-9faf32a3d49af4fc.yaml b/releasenotes/notes/feature-flags-9faf32a3d49af4fc.yaml
new file mode 100644
index 0000000000..cda81f7eda
--- /dev/null
+++ b/releasenotes/notes/feature-flags-9faf32a3d49af4fc.yaml
@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Support is added to enable all stable RabbitMQ feature flags by default.
+    This happens automatically post upgrade, and avoids compatibility issues
+    which could occur when installing a new version of RabbitMQ.
diff --git a/releasenotes/notes/octavia-ovn-provider-driver-3efd5e7e77291b78.yaml b/releasenotes/notes/octavia-ovn-provider-driver-3efd5e7e77291b78.yaml
new file mode 100644
index 0000000000..3a2d2994aa
--- /dev/null
+++ b/releasenotes/notes/octavia-ovn-provider-driver-3efd5e7e77291b78.yaml
@@ -0,0 +1,13 @@
+---
+features:
+  - |
+    A new parameter, `octavia_ovn_enabled`, is added to support the
+    Octavia OVN provider driver. The Octavia OVN provider driver
+    is an alternative to amphora and uses built-in support for
+    load balancing withing OVN/OVS. The `ml2.ovn` Neutron plugin
+    is required for this functionality. The OVN provider can be used
+    during load balancer creation by specifying the `--provider ovn`
+    argument for the `openstack loadbalancer create` command.
+  - |
+    Added new variable ``octavia_enabled_provider_agents`` that allows
+    to enable Provider Agents for Octavia.