diff --git a/ansible-collection-requirements.yml b/ansible-collection-requirements.yml
index 9b34ffaa29..5b51e3eb3c 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: bbd5e7af26a2f8e07db2b5b56c475838eefa11e8
+  version: master
 - 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 ca26ab6650..218d537bed 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: f97af4730128237271ab275c6deae4e156223119
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-24'
+  shallow_since: '2024-06-03'
 - name: frrouting
   scm: git
   src: https://opendev.org/openstack/ansible-role-frrouting
-  version: e2cad6df4c0fbcffe92cde91b6c33dede3c32f0f
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-02'
+  shallow_since: '2024-06-03'
 - name: pki
   src: https://opendev.org/openstack/ansible-role-pki
   scm: git
-  version: 30b72fcdd9999a02b8661233e78897358a9d4a17
+  version: master
   trackbranch: master
-  shallow_since: '2023-10-24'
+  shallow_since: '2024-06-03'
 - name: python_venv_build
   src: https://opendev.org/openstack/ansible-role-python_venv_build
   scm: git
-  version: b979615635f2e90210d760bb4c65495452532b0f
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-23'
+  shallow_since: '2024-06-03'
 - name: qdrouterd
   scm: git
   src: https://opendev.org/openstack/ansible-role-qdrouterd
-  version: d5408ead242f786b10586832931d53efc557aaca
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-09'
+  shallow_since: '2024-06-03'
 - name: systemd_mount
   src: https://opendev.org/openstack/ansible-role-systemd_mount
   scm: git
-  version: 544c525c6dd7dcd02acc5f815721f0bbfd3ad35c
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-09'
+  shallow_since: '2024-06-03'
 - name: systemd_networkd
   src: https://opendev.org/openstack/ansible-role-systemd_networkd
   scm: git
-  version: 12a0da6ab8c1dbfc171f895e31e39a9c5a006bcb
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-13'
+  shallow_since: '2024-06-03'
 - name: systemd_service
   src: https://opendev.org/openstack/ansible-role-systemd_service
   scm: git
-  version: cd1b5db27b2011e3cd39cb1aa9474bc7b974db9d
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-09'
+  shallow_since: '2024-06-03'
 - name: uwsgi
   src: https://opendev.org/openstack/ansible-role-uwsgi
   scm: git
-  version: 1abd10d18d03b8a9b68b36b5726ac985597b45c3
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-24'
+  shallow_since: '2024-06-03'
 - name: zookeeper
   src: https://opendev.org/openstack/ansible-role-zookeeper
   scm: git
-  version: dbbcf1122cbe32fd8d8f7676214e44f5b0a78773
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-09'
+  shallow_since: '2024-06-03'
 - name: apt_package_pinning
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-apt_package_pinning
-  version: 3d52ce41d6070c33490568b297fd8f210ff5ecac
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-08'
+  shallow_since: '2024-06-03'
 - name: ceph_client
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-ceph_client
-  version: 07d41f641f7994b05ee463e750a4dc899e064844
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-29'
+  shallow_since: '2024-06-03'
 - name: galera_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-galera_server
-  version: e5b4fd0d55a6e581d50bea929fe964879f6e6335
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-23'
+  shallow_since: '2024-06-03'
 - name: haproxy_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-haproxy_server
-  version: efaee49680542994a2b1d02ce9448f27f6618f6c
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-15'
+  shallow_since: '2024-06-03'
 - name: lxc_container_create
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_container_create
-  version: 3a5f7651e9eb297fe3393ad843365032bad33092
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-05'
+  shallow_since: '2024-06-03'
 - name: lxc_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-lxc_hosts
-  version: 7b5fc5afab419afc9f17e7286375ad6b08b5d20d
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-18'
+  shallow_since: '2024-06-03'
 - name: memcached_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-memcached_server
-  version: 85b029e2869c1d47d3a7e83c658b902b38818a93
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-18'
+  shallow_since: '2024-06-03'
 - name: openstack_hosts
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_hosts
-  version: 09ae63d721c751eaf9e8f240c182c66cd7558963
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-04'
+  shallow_since: '2024-06-03'
 - name: openstack_openrc
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-openstack_openrc
-  version: 3c232635fcfd75713c001b49930dafbc6c70a99a
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-02'
+  shallow_since: '2024-06-03'
 - name: os_adjutant
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_adjutant
-  version: e89e3b34f1bb7f152c9cde5221f45dfdf503ef22
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-09'
+  shallow_since: '2024-06-03'
 - name: os_aodh
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_aodh
-  version: e53cd5d886df49bd18d089dec18f1348e26f95ff
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_barbican
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_barbican
-  version: caaab70104d0c9d8020c543bf6cc9ac5fb769fdb
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_blazar
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_blazar
-  version: 648bff0d1d65da16692799f12928fdc353d1d5d0
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_ceilometer
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ceilometer
-  version: 8b5c109e8a18377019ed815cea80750b267af26a
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-01'
+  shallow_since: '2024-06-03'
 - name: os_cinder
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cinder
-  version: eb70c981dd320234bf64a61ea44710323f6a842b
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_cloudkitty
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_cloudkitty
-  version: 5a34d2f0f1578da9c9b4187b2f97f8871509d352
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_designate
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_designate
-  version: 8b68114626215ca3eb6666bc90b74c23f7ec6bd0
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_glance
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_glance
-  version: 96cd191579376945b98adc548afc73e8f8330972
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_gnocchi
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_gnocchi
-  version: 76b3bdd91acf302c4384c7e40193047235dda2bd
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_heat
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_heat
-  version: d03507db2905659adb02288ba5ba7f59ea4dfc88
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_horizon
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_horizon
-  version: aac5e4506a6df0c6eb1e5b199542367daf067896
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-01'
+  shallow_since: '2024-06-03'
 - name: os_ironic
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_ironic
-  version: 8980eacd6736a0df3f6259b03a17793494ecb2cb
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_keystone
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_keystone
-  version: 199ed67d8131f2f7c889005b035607e75bd2c2e0
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-01'
+  shallow_since: '2024-06-03'
 - name: os_magnum
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_magnum
-  version: 2275dfff2c7fcedc020adffe6849587ac513d287
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-28'
+  shallow_since: '2024-06-03'
 - name: os_manila
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_manila
-  version: bedc003fb209930a8021cb0aca88c1379c750887
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-24'
+  shallow_since: '2024-06-03'
 - name: os_masakari
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_masakari
-  version: 0aeda2bb5a08a19292d1fe359006b633062ff3a1
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-23'
+  shallow_since: '2024-06-03'
 - name: os_mistral
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_mistral
-  version: 9efd1d8842c0892bca1503946df15b5c68daa31d
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_neutron
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_neutron
-  version: 96fb295bbc5c77c8ea139f523d1cc4e8b506f165
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-23'
+  shallow_since: '2024-06-03'
 - name: os_nova
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_nova
-  version: d106a515eb2fc0f1d1f5fbbd237611266c4e53d8
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-06'
+  shallow_since: '2024-06-03'
 - name: os_octavia
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_octavia
-  version: 40b8a2e0e2f8dacf8a2d262872e40716dfaa330c
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-08'
+  shallow_since: '2024-06-03'
 - name: os_placement
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_placement
-  version: 76cd5e0730544be3ba13eef188b7e137d54c3107
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_rally
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_rally
-  version: d3a345bd4f3bf35df32b397b3f8cf46a59f2aba0
+  version: master
   trackbranch: master
-  shallow_since: '2024-05-09'
+  shallow_since: '2024-06-03'
 - name: os_skyline
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_skyline
-  version: 7b19e16cbb076cb0d85c4a592750580a9aadf596
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-18'
+  shallow_since: '2024-06-03'
 - name: os_swift
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_swift
-  version: 45f66c28b89e283d5d9aa55b969ec4305d5d75c8
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_tacker
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tacker
-  version: 436089d596552164d942342362724c1542fbc5ca
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_tempest
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_tempest
-  version: 6b9c22c38060ddc85807dbf22c2a9b523990d55f
+  version: master
   trackbranch: master
-  shallow_since: '2024-07-21'
+  shallow_since: '2024-06-03'
 - name: os_trove
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_trove
-  version: 9a73e4a0b854a07b308d17a795e24afd79d0dff8
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-02'
+  shallow_since: '2024-06-03'
 - name: os_zun
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-os_zun
-  version: 9c4ff72a6c3d1022a0c02e26c41ecefdb7bc282a
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-01'
+  shallow_since: '2024-06-03'
 - name: rabbitmq_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-rabbitmq_server
-  version: 878ac35f100f97fdabaf08eae3c4f15e71d1bd70
+  version: master
   trackbranch: master
-  shallow_since: '2024-10-08'
+  shallow_since: '2024-06-03'
 - name: repo_server
   scm: git
   src: https://opendev.org/openstack/openstack-ansible-repo_server
-  version: c6923ea133c013b24c6bc71b46430cd841d167ed
+  version: master
   trackbranch: master
-  shallow_since: '2024-09-24'
+  shallow_since: '2024-06-03'
 # External dependencies
 - name: etcd
   scm: git
   src: https://github.com/noonedeadpunk/ansible-etcd
-  version: de3b061e954d3259e0a48e2e55878f598ef3a9c1
+  version: master
   trackbranch: master
   shallow_since: '2023-04-11'
 - name: keepalived
   scm: git
   src: https://github.com/evrardjp/ansible-keepalived
-  version: a73191c2e49cc7ce1c4a17fd90ef460c76439e94
+  version: master
   trackbranch: master
   shallow_since: '2023-05-18'
 - name: pacemaker_corosync
   scm: git
   src: https://github.com/noonedeadpunk/ansible-pacemaker-corosync
-  version: f05132b5334dfec0414bb82c4e6f015cf64907b5
+  version: master
   trackbranch: master
-  shallow_since: '2024-06-13'
+  shallow_since: '2023-10-19'
 - name: resolvconf
   scm: git
   src: https://github.com/logan2211/ansible-resolvconf
-  version: f7f694b3dd4361e364dccb4ce94e6510727fca2f
+  version: master
   trackbranch: master
   shallow_since: '2021-03-31'
 - name: unbound
   scm: git
   src: https://github.com/noonedeadpunk/ansible-role-unbound
-  version: 26abb238925dec80707ef7e4b869b3c5e48d4f7b
+  version: master
   trackbranch: master
   shallow_since: '2023-02-09'
 - name: ceph-ansible
   scm: git
   src: https://github.com/ceph/ceph-ansible
-  version: 3500ea50445eb4fa4f5c26e9f81cc0dcfbbc79e5
+  version: stable-8.0
   trackbranch: stable-8.0
-  shallow_since: '2024-10-13'
+  shallow_since: '2024-05-15'