diff --git a/common/deployments/hub-production.yaml b/common/deployments/hub-production.yaml
index d4242f37418fd9f0d22b13363d7c76c758cf7125..4398702ca20bf1258fc5a88da91f4757dc929c03 100644
--- a/common/deployments/hub-production.yaml
+++ b/common/deployments/hub-production.yaml
@@ -177,7 +177,7 @@ hub:
         - urn:geant:open-science-cloud.ec.europa.eu:res:notebooks.open-science-cloud.ec.europa.eu:8-vcpu-16-gb-ram-gpu:act:ppa
       admin_groups:
         - urn:geant:open-science-cloud.ec.europa.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
-      claim_groups_key: "entitlements"
+      auth_state_groups_key:  "oauth_user.entitlements"
     EGICheckinAuthenticator:
       checkin_host: "{{ secrets['checkin_host'] }}"
       authorize_url: "https://{{ secrets['checkin_host'] }}/OIDC/authorization"
diff --git a/common/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml
index 52f974006904238875b90725af892996703870d5..47f492d4c8460d903d3fcc54fd71ba24fa5c881a 100644
--- a/common/deployments/hub-staging.yaml
+++ b/common/deployments/hub-staging.yaml
@@ -177,7 +177,7 @@ hub:
         - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:8-vcpu-16-gb-ram-gpu:act:ppa
       admin_groups:
         - urn:geant:eosc-federation.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
-      claim_groups_key: "entitlements"
+      auth_state_groups_key:  "oauth_user.entitlements"
     EGICheckinAuthenticator:
       checkin_host: "{{ secrets['checkin_host'] }}"
       authorize_url: "https://{{ secrets['checkin_host'] }}/OIDC/authorization"
diff --git a/eosc-devel/deployments/fullhub.yaml b/eosc-devel/deployments/fullhub.yaml
index 4b9b4ddbab4daf4bc40ede354cd1c0761c00904e..60d23e55cf65eb7bfb2b14e05a8100210f46c528 100644
--- a/eosc-devel/deployments/fullhub.yaml
+++ b/eosc-devel/deployments/fullhub.yaml
@@ -196,7 +196,7 @@ hub:
         - urn:geant:eosc-federation.eu:testing:group:eosc
       admin_groups:
         - urn:geant:eosc-federation.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
-      claim_groups_key: "entitlements"
+      auth_state_groups_key:  "oauth_user.entitlements"
     EGICheckinAuthenticator:
       checkin_host: "{{ secrets['checkin_host'] }}"
       authorize_url: "https://{{ secrets['checkin_host'] }}/OIDC/authorization"
diff --git a/eosc-testing/deployments/hub.yaml b/eosc-testing/deployments/hub.yaml
index 92601b2fe761fc4ee7cb5a57168260f39962ebdd..75ef10336a9b67ac0f2f6978e82be32c50ba0209 100644
--- a/eosc-testing/deployments/hub.yaml
+++ b/eosc-testing/deployments/hub.yaml
@@ -178,7 +178,7 @@ hub:
         - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:8-vcpu-16-gb-ram-gpu:act:ppa
       admin_groups:
         - urn:geant:eosc-federation.eu:group:asg:notebooks.open-science-cloud.ec.europa.eu:role=admin
-      claim_groups_key: "entitlements"
+      auth_state_groups_key:  "oauth_user.entitlements"
     EGICheckinAuthenticator:
       checkin_host: "{{ secrets['checkin_host'] }}"
       authorize_url: "https://{{ secrets['checkin_host'] }}/OIDC/authorization"