diff --git a/.zuul.yaml b/.zuul.yaml
index 4570d05..34d545b 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -15,55 +15,55 @@
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py39:
             nodeset: ubuntu-focal
             voting: false
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py310:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py311:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py312:
             nodeset: ubuntu-noble
             voting: false
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
     gate:
       jobs:
         - openstack-tox-pep8:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py39:
             nodeset: ubuntu-focal
             voting: false
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py310:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py311:
             nodeset: ubuntu-jammy
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
         - openstack-tox-py312:
             nodeset: ubuntu-noble
             voting: false
             required-projects:
               - name: openstack/requirements
-                override-checkout: stable/2024.2
+                override-checkout: stable/2025.1
diff --git a/gbpautomation/heat/engine/clients/os/grouppolicy.py b/gbpautomation/heat/engine/clients/os/grouppolicy.py
index ad68188..d52d034 100644
--- a/gbpautomation/heat/engine/clients/os/grouppolicy.py
+++ b/gbpautomation/heat/engine/clients/os/grouppolicy.py
@@ -33,7 +33,7 @@ class GBPClientPlugin(client_plugin.ClientPlugin):
             'auth_url': con.auth_url,
             'service_type': 'network',
             'token': con.keystone_session.get_token(),
-            'project_id': con.tenant_id,
+            'project_id': con.project_id,
             'endpoint_url': endpoint,
             'endpoint_type': endpoint_type,
             'ca_cert': self._get_client_option('grouppolicy', 'ca_file'),
diff --git a/test-requirements.txt b/test-requirements.txt
index 5e69025..8d202bb 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/2024.2#egg=openstack-heat
--e git+https://opendev.org/x/python-group-based-policy-client.git@stable/2024.2#egg=python-group-based-policy-client
+-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
 # 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 2fd6c7d..8f7c491 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/2024.2}
+    -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1}
     -r{toxinidir}/requirements.txt
     -r{toxinidir}/test-requirements.txt
 commands =