diff --git a/common/deployments/hub-staging.yaml b/common/deployments/hub-staging.yaml
index cd2b04954c2778e49730b729efb2c438030d4dc8..9b35202edba22a11d92a71299667a8568f824a32 100644
--- a/common/deployments/hub-staging.yaml
+++ b/common/deployments/hub-staging.yaml
@@ -63,6 +63,8 @@ singleuser:
           - "--CondaKernelSpecManager.env_filter='/opt/conda$'"
         extra_annotations:
           "egi.eu/flavor": "small-environment-2-vcpu-4-gb-ram"
+      vo_claims:
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:2-vcpu-4-gb-ram:act:ppa
     - display_name: Medium Environment - 4 vCPU / 8 GB RAM
       description: >
         The notebook environment includes Python, R, Julia and Octave kernels.
@@ -75,6 +77,8 @@ singleuser:
         cpu_limit: 4
         mem_guarantee: 1G
         mem_limit: 8G
+      vo_claims:
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:4-vcpu-8-gb-ram:act:ppa
     - display_name: Large Environment - 8 vCPU / 16 GB RAM / GPU
       description: >
         The notebook environment includes Python, R, Julia and Octave kernels with GPU.
@@ -91,6 +95,8 @@ singleuser:
           nvidia.com/gpu: 1
         extra_resource_limits:
           nvidia.com/gpu: 1
+      vo_claims:
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:8-vcpu-16-gb-ram-gpu:act:ppa
   cmd: jupyterhub-singleuser-webdav-wrapper
   extraFiles:
     wait-remote-home.sh:
@@ -163,8 +169,11 @@ hub:
         # valtri@civ.zcu.cz
         - 94d3cde7-3121-4b33-b4c2-526c67e8cb38@eosc-federation.eu
       allowed_groups:
-        - urn:geant:eosc-federation.eu:staging:group:eosc
-      auto_login: true
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:2-vcpu-4-gb-ram:act:ppa
+        - urn:geant:eosc-federation.eu:res:notebooks.open-science-cloud.ec.europa.eu:4-vcpu-8-gb-ram:act:ppa
+        - 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"
     EGICheckinAuthenticator:
       checkin_host: "{{ secret['checkin_host'] }}"