diff --git a/.zuul.yaml b/.zuul.yaml
index d7d0015..084c71c 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,51 +15,51 @@
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py310:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py311:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py312:
             nodeset: ubuntu-noble
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py313:
             nodeset: ubuntu-noble
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
     gate:
       jobs:
         - openstack-tox-pep8:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py310:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py311:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py312:
             nodeset: ubuntu-noble
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
         - openstack-tox-py313:
             nodeset: ubuntu-noble
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2025.1
+                override-checkout: stable/2025.2
diff --git a/gbpautomation/heat/__init__.py b/gbpautomation/heat/__init__.py
index e69de29..ab8ba12 100644
--- a/gbpautomation/heat/__init__.py
+++ b/gbpautomation/heat/__init__.py
@@ -0,0 +1,7 @@
+from oslo_service import backend
+
+# Prevent oslo_service backend reinitialization conflict
+try:
+    backend.init_backend(backend.BackendType.THREADING)
+except backend.BackendAlreadySelected:
+    pass
diff --git a/test-requirements.txt b/test-requirements.txt
index 8d202bb..655da84 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,8 +3,8 @@
 # process, which may cause wedges in the gate later.
 
 
--e git+https://opendev.org/openstack/heat.git@stable/2025.1#egg=openstack-heat
--e git+https://opendev.org/x/python-group-based-policy-client.git@stable/2025.1#egg=python-group-based-policy-client
+-e git+https://opendev.org/openstack/heat.git@stable/2025.2#egg=openstack-heat
+-e git+https://opendev.org/x/python-group-based-policy-client.git@stable/2025.2#egg=python-group-based-policy-client
 # Hacking already pins down pep8, pyflakes and flake8
 hacking>=3.0.1,<3.1.0; # Apache-2.0
 # remove this pyflakes from here once you bump the
diff --git a/tox.ini b/tox.ini
index 7813330..918a9d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -16,7 +16,7 @@ setenv = VIRTUAL_ENV={envdir}
 usedevelop = True
 install_command = pip install {opts} {packages}
 deps =
-    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.2}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands =