diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bfa4a542..2b3a0efb7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
 
 ### Feature
 
+- **Roles and Permissions**
+  - Enable more fine grained permission checks by client id and roles
 - **Customer Detail Data Overlay**
   - implement new UI design for customer detail data overlay
 - **Company Subscription Management**
diff --git a/index.html b/index.html
index 1a72c3909..ef42715e5 100644
--- a/index.html
+++ b/index.html
@@ -29,8 +29,8 @@
     <div id="app"></div>
     <script>
       // Do NOT change 'ENV' without changing 'custom_env_vars_anchor' in scripts/inject-dynamic-env.sh as well
-      const ENV = {REQUIRE_HTTPS_URL_PATTERN:"true",PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_POOL_API_URL:"https://business-partners.example.org/pool/v6",BPDM_GATE_API_URL:"https://business-partners.example.org/companies/test-company/v6",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}
+      const ENV = {REQUIRE_HTTPS_URL_PATTERN:"true",PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_POOL_API_URL:"https://business-partners.example.org/pool/v6",BPDM_GATE_API_URL:"https://business-partners.example.org/companies/test-company/v6",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_REGISTRATION:"Cl1-CX-Registration",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_BPDM:"Cl7-CX-BPDM",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}
     </script>
     <script type="module" src="/src/index.tsx"></script>
   </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/providers.html b/providers.html
new file mode 100644
index 000000000..fdf3299e0
--- /dev/null
+++ b/providers.html
@@ -0,0 +1,515 @@
+const data = [
+    {
+        "name": "CX-Operator",
+        "alias": "CX-Operator",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/CX-Operator/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Uniper SE",
+        "alias": "idp2",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp2/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Krones AG",
+        "alias": "idp3",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp3/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "MAN SE",
+        "alias": "idp4",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp4/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SOH Dataspace AG",
+        "alias": "idp6",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp6/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Krones Dup AG",
+        "alias": "idp7",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp7/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Resöüt",
+        "alias": "idp8",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp8/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "4zero Solutions GmbH",
+        "alias": "idp9",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp9/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Saller GmbH",
+        "alias": "idp18",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp18/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Arnsburg Apotheke &quot;Alte Bornheimer Apotheke&quot; e.K.",
+        "alias": "idp19",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp19/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Automotive Cells Co",
+        "alias": "idp20",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp20/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SAP Deutschland SE &amp; Co. KG",
+        "alias": "idp21",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp21/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Continental Automotive Technologies GmbH",
+        "alias": "idp22",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp22/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SAP France",
+        "alias": "idp23",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp23/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SAP Italia S.p.A.",
+        "alias": "idp24",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp24/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SAP Österreich GmbH",
+        "alias": "idp25",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp25/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Covestro Deutschland AG",
+        "alias": "idp26",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp26/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SAP SE",
+        "alias": "idp27",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp27/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Schaeffler AG",
+        "alias": "idp28",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp28/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Schaeffler Technologies AG &amp; Co. KG",
+        "alias": "idp29",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp29/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Schaeffler Engineering GmbH",
+        "alias": "idp30",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp30/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "DatafabriQ UG",
+        "alias": "idp31",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp31/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "B. Fischer AG",
+        "alias": "idp32",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp32/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Siemens Advanta Solutions GmbH",
+        "alias": "idp33",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp33/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Delos Cloud GmbH",
+        "alias": "idp34",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp34/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "BASF Digital Solutions S.L.U.",
+        "alias": "idp35",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp35/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "BASF SE",
+        "alias": "idp36",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp36/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Denso Automotive Deutschland GmbH",
+        "alias": "idp37",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp37/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "BloqSens AG",
+        "alias": "idp38",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp38/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "DENSO CORPORATION",
+        "alias": "idp39",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp39/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "BMW AG",
+        "alias": "idp40",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp40/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "HELLA GmbH &amp; Co. KGaA",
+        "alias": "idp41",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp41/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Detecon International GmbH",
+        "alias": "idp42",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp42/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Capgemini Deutschland GmbH",
+        "alias": "idp43",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp43/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "CatX Service GmbH",
+        "alias": "idp44",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp44/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Eberspächer Controls Esslingen GmbH &amp; Co. KG",
+        "alias": "idp45",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp45/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Hirschmann Automotive GmbH",
+        "alias": "idp46",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp46/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Siemens AG",
+        "alias": "idp47",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp47/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "EJOT SE &amp; Co. KG",
+        "alias": "idp48",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp48/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Hybris GmbH",
+        "alias": "idp49",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp49/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Flex Automotive GmbH",
+        "alias": "idp50",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp50/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Siemens Industry Software GmbH",
+        "alias": "idp51",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp51/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "sovity GmbH",
+        "alias": "idp54",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp54/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SK Inc.",
+        "alias": "idp55",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp55/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Ford Werke GmbH",
+        "alias": "idp56",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp56/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Forvia",
+        "alias": "idp57",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp57/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Spherity GmbH",
+        "alias": "idp58",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp58/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "FORD ESPANA SL",
+        "alias": "idp52",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp52/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "IAV GmbH Ingenieurgesellschaft Auto und Verkehr",
+        "alias": "idp53",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp53/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "IBM Deutschland GmbH",
+        "alias": "idp59",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp59/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Light ds GmbH",
+        "alias": "idp60",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp60/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SSC-Services GmbH",
+        "alias": "idp61",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp61/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "German Edge Cloud GmbH &amp; Co. KG",
+        "alias": "idp62",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp62/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Stellantis N.V.",
+        "alias": "idp63",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp63/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Lisa Dräxlmaier GmbH",
+        "alias": "idp64",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp64/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Harman Becker Automotive Systems GmbH",
+        "alias": "idp65",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp65/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "SupplyOn AG",
+        "alias": "idp66",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp66/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Trebing &amp; Himstedt Prozeßautomation GmbH &amp; Co. KG",
+        "alias": "idp67",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp67/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "T-Systems International GmbH",
+        "alias": "idp68",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp68/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Volkswagen AG",
+        "alias": "idp69",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp69/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "WITTE Automotive GmbH",
+        "alias": "idp70",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp70/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "ZF Friedrichshafen AG",
+        "alias": "idp71",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp71/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Antipodean GmbH",
+        "alias": "idp72",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp72/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Magna International (Germany) GmbH",
+        "alias": "idp73",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp73/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "AROMA GLOBAL 3 d.o.o",
+        "alias": "idp74",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp74/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "MAHLE International GmbH",
+        "alias": "idp75",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp75/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Materna Information &amp; Communications SE",
+        "alias": "idp76",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp76/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Mercedes-Benz Group AG",
+        "alias": "idp77",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp77/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "MHP Management- und IT-Beratung GmbH",
+        "alias": "idp78",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp78/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "NTT Communications Corporation",
+        "alias": "idp79",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp79/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "NTT Germany",
+        "alias": "idp80",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp80/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "NTT Luxembourg PSF SA",
+        "alias": "idp81",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp81/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "NTT Netherlands B.V.",
+        "alias": "idp82",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp82/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "OETINGER Aluminum GmbH",
+        "alias": "idp83",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp83/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Polygran GmbH",
+        "alias": "idp84",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp84/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Pöppelmann Kunststoff-Technik GmbH &amp; Co. KG",
+        "alias": "idp85",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp85/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Contemporary Amperex Technology",
+        "alias": "idp86",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp86/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Renault SAS",
+        "alias": "idp87",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp87/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "RenewEarth Lab Inc",
+        "alias": "idp88",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp88/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Franke Holding AG",
+        "alias": "idp89",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp89/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Rhenus Automotive SE",
+        "alias": "idp90",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp90/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "RITTAL GmbH &amp; Co. KG",
+        "alias": "idp91",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp91/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Robert Bosch GmbH",
+        "alias": "idp92",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp92/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "Robert Bosch Manufacturing Solutions GmbH",
+        "alias": "idp93",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp93/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    {
+        "name": "S1Seven GmbH",
+        "alias": "idp94",
+        "provider": "keycloak-oidc",
+        "url": "/auth/realms/CX-Central/broker/idp94/login?client_id=Cl2-CX-Portal&amp;tab_id=n0o38pB50y8&amp;session_code=oWrl70zGNNgkCIaNN5nRuom6CuEu3DInyHI4Pn7e7AE"
+    },
+    null
+]
+
+console.log(data)
\ No newline at end of file
diff --git a/scripts/inject-dynamic-env.sh b/scripts/inject-dynamic-env.sh
index 84de178ba..dfa698eb2 100644
--- a/scripts/inject-dynamic-env.sh
+++ b/scripts/inject-dynamic-env.sh
@@ -20,9 +20,9 @@
 ###############################################################
 
 # Define custom variable
-custom_env_vars='{REQUIRE_HTTPS_URL_PATTERN:"'$REQUIRE_HTTPS_URL_PATTERN'",PORTAL_ASSETS_URL:"'$PORTAL_ASSETS_URL'",PORTAL_BACKEND_URL:"'$PORTAL_BACKEND_URL'",CENTRALIDP_URL:"'$CENTRALIDP_URL'",SSI_CREDENTIAL_URL:"'$SSI_CREDENTIAL_URL'",BPDM_POOL_API_URL:"'$BPDM_POOL_API_URL'",BPDM_GATE_API_URL:"'$BPDM_GATE_API_URL'",SEMANTICS_URL:"'$SEMANTICS_URL'",MANAGED_IDENTITY_WALLETS_NEW_URL:"'$MANAGED_IDENTITY_WALLETS_NEW_URL'",REALM:"'$REALM'",CLIENT_ID:"'$CLIENT_ID'",CLIENT_ID_SEMANTIC:"'$CLIENT_ID_SEMANTIC'",CLIENT_ID_MIW:"'$CLIENT_ID_MIW'",CLIENT_ID_SSI_CREDENTIAL:"'$CLIENT_ID_SSI_CREDENTIAL'"}'
+custom_env_vars='{REQUIRE_HTTPS_URL_PATTERN:"'$REQUIRE_HTTPS_URL_PATTERN'",PORTAL_ASSETS_URL:"'$PORTAL_ASSETS_URL'",PORTAL_BACKEND_URL:"'$PORTAL_BACKEND_URL'",CENTRALIDP_URL:"'$CENTRALIDP_URL'",SSI_CREDENTIAL_URL:"'$SSI_CREDENTIAL_URL'",BPDM_POOL_API_URL:"'$BPDM_POOL_API_URL'",BPDM_GATE_API_URL:"'$BPDM_GATE_API_URL'",SEMANTICS_URL:"'$SEMANTICS_URL'",MANAGED_IDENTITY_WALLETS_NEW_URL:"'$MANAGED_IDENTITY_WALLETS_NEW_URL'",REALM:"'$REALM'",CLIENT_ID:"'$CLIENT_ID'",CLIENT_ID_REGISTRATION:"'$CLIENT_ID_REGISTRATION'",CLIENT_ID_SEMANTIC:"'$CLIENT_ID_SEMANTIC'",CLIENT_ID_BPDM:"'$CLIENT_ID_BPDM'",CLIENT_ID_MIW:"'$CLIENT_ID_MIW'",CLIENT_ID_SSI_CREDENTIAL:"'$CLIENT_ID_SSI_CREDENTIAL'"}'
 # Define anchor variable
-custom_env_vars_anchor='{REQUIRE_HTTPS_URL_PATTERN:"true",PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_POOL_API_URL:"https://business-partners.example.org/pool/v6",BPDM_GATE_API_URL:"https://business-partners.example.org/companies/test-company/v6",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}'
+custom_env_vars_anchor='{REQUIRE_HTTPS_URL_PATTERN:"true",PORTAL_ASSETS_URL:"http://localhost:3000/assets",PORTAL_BACKEND_URL:"https://portal-backend.example.org",CENTRALIDP_URL:"https://centralidp.example.org/auth",SSI_CREDENTIAL_URL:"https://ssi-credential-issuer.example.org",BPDM_POOL_API_URL:"https://business-partners.example.org/pool/v6",BPDM_GATE_API_URL:"https://business-partners.example.org/companies/test-company/v6",SEMANTICS_URL:"https://semantics.example.org",MANAGED_IDENTITY_WALLETS_NEW_URL:"https://managed-identity-wallets-new.example.org",REALM:"CX-Central",CLIENT_ID:"Cl2-CX-Portal",CLIENT_ID_REGISTRATION:"Cl1-CX-Registration",CLIENT_ID_SEMANTIC:"Cl3-CX-Semantic",CLIENT_ID_BPDM:"Cl7-CX-BPDM",CLIENT_ID_MIW:"Cl5-CX-Custodian",CLIENT_ID_SSI_CREDENTIAL:"Cl24-CX-SSI-CredentialIssuer"}'
 # Read content of the reference index.html file into the index_html_reference variable
 index_html_reference=`cat /usr/share/nginx/html/index.html.reference`
 # Replace the anchor variable with the custom variable in the index.html file 
diff --git a/src/components/AuthProvider.tsx b/src/components/AuthProvider.tsx
deleted file mode 100644
index 75fc2f080..000000000
--- a/src/components/AuthProvider.tsx
+++ /dev/null
@@ -1,35 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023 BMW Group AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-import { useEffect } from 'react'
-import { useDispatch } from 'react-redux'
-import { setLoggedUser } from 'features/user/slice'
-import type { IUser } from 'features/user/types'
-
-export function AuthProvider(props: {
-  children: JSX.Element
-  user: IUser
-}): JSX.Element {
-  const dispatch = useDispatch()
-  useEffect(() => {
-    dispatch(setLoggedUser(props.user))
-  }, [dispatch, props.user])
-  return <>{props.children}</>
-}
diff --git a/src/components/overlays/CompanyCertificateDetails/index.tsx b/src/components/overlays/CompanyCertificateDetails/index.tsx
index 8bd3e5d84..7391f37df 100644
--- a/src/components/overlays/CompanyCertificateDetails/index.tsx
+++ b/src/components/overlays/CompanyCertificateDetails/index.tsx
@@ -46,8 +46,8 @@ import { useEffect, useState } from 'react'
 import { OVERLAYS, ROLES } from 'types/Constants'
 import dayjs from 'dayjs'
 import LoadingProgress from 'components/shared/basic/LoadingProgress'
-import UserService from 'services/UserService'
 import { SortType } from 'components/pages/CompanyCertificates'
+import { userHasPortalRole } from 'services/AccessService'
 
 export enum StatusTag {
   PENDING = 'Pending',
@@ -209,7 +209,7 @@ export default function CompanyCertificateDetails({
               <Box>
                 <Button
                   disabled={
-                    !UserService.hasRole(ROLES.SUBSCRIBE_SERVICE_MARKETPLACE)
+                    !userHasPortalRole(ROLES.SUBSCRIBE_SERVICE_MARKETPLACE)
                   }
                   startIcon={<DeleteIcon />}
                   variant="outlined"
diff --git a/src/components/pages/AdminCredential/AdminCredentialElements.tsx b/src/components/pages/AdminCredential/AdminCredentialElements.tsx
index 0ca5926ed..da63351b4 100644
--- a/src/components/pages/AdminCredential/AdminCredentialElements.tsx
+++ b/src/components/pages/AdminCredential/AdminCredentialElements.tsx
@@ -48,9 +48,9 @@ import {
   StatusTag,
   Tooltips,
 } from '@catena-x/portal-shared-components'
-import UserService from 'services/UserService'
 import { ROLES } from 'types/Constants'
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore'
+import { userHasSsiCredentialRole } from 'services/AccessService'
 
 interface FetchHookArgsType {
   filterType: string
@@ -224,7 +224,7 @@ export default function AdminCredentialElements() {
         </div>
       )
     } else if (
-      UserService.hasRole(ROLES.REVOKE_CREDENTIALS_ISSUER) &&
+      userHasSsiCredentialRole(ROLES.REVOKE_CREDENTIALS_ISSUER) &&
       row.participantStatus === StatusEnum.ACTIVE
     ) {
       return (
diff --git a/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx b/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx
index 766749289..e148b7b9b 100644
--- a/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx
+++ b/src/components/pages/AppDetail/components/AppDetailHeader/index.tsx
@@ -18,7 +18,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import { useSelector, useDispatch } from 'react-redux'
+import { useDispatch, useSelector } from 'react-redux'
 import {
   Typography,
   OrderStatusButton,
@@ -26,7 +26,6 @@ import {
 } from '@catena-x/portal-shared-components'
 import { useTranslation } from 'react-i18next'
 import type { AppDetails } from 'features/apps/details/types'
-import { userSelector } from 'features/user/slice'
 import './AppDetailHeader.scss'
 import { OVERLAYS, ROLES } from 'types/Constants'
 import { show } from 'features/control/overlay'
@@ -36,6 +35,7 @@ import { SubscriptionStatus } from 'features/apps/types'
 import { useFetchDocumentByIdMutation } from 'features/apps/apiSlice'
 import CommonService from 'services/CommonService'
 import type { UseCaseType } from 'features/appManagement/types'
+import { userHasPortalRole } from 'services/AccessService'
 import type { RootState } from 'features/store'
 
 export interface AppDetailHeaderProps {
@@ -57,7 +57,6 @@ export default function AppDetailHeader({ item }: AppDetailHeaderProps) {
   )
 
   const { appId } = useParams()
-  const user = useSelector(userSelector)
   const [image, setImage] = useState('')
   const [fetchDocumentById] = useFetchDocumentByIdMutation()
   const [buttonLabel, setButtonLabel] = useState(
@@ -105,10 +104,9 @@ export default function AppDetailHeader({ item }: AppDetailHeaderProps) {
         break
       default:
         btnColor = {
-          color:
-            user.roles.indexOf(ROLES.SUBSCRIBE_APP_MARKETPLACE) !== -1
-              ? 'primary'
-              : 'secondary',
+          color: userHasPortalRole(ROLES.SUBSCRIBE_APP_MARKETPLACE)
+            ? 'primary'
+            : 'secondary',
           background1: paletteDefinitions.buttons.darkGrey ?? '',
           background2: paletteDefinitions.buttons.lightGrey ?? '',
           background3: paletteDefinitions.buttons.white ?? '',
@@ -148,9 +146,7 @@ export default function AppDetailHeader({ item }: AppDetailHeaderProps) {
         buttonData={OrderStatusButtonItems}
         selectable={
           subscribeStatus === SubscriptionStatus.INACTIVE &&
-          user.roles.indexOf(ROLES.SUBSCRIBE_APP_MARKETPLACE) !== -1
-            ? true
-            : false
+          userHasPortalRole(ROLES.SUBSCRIBE_APP_MARKETPLACE)
         }
         onButtonClick={() => {
           if (buttonLabel === t('content.appdetail.requested')) {
@@ -158,7 +154,7 @@ export default function AppDetailHeader({ item }: AppDetailHeaderProps) {
           }
           return (
             subscribeStatus === SubscriptionStatus.INACTIVE &&
-            user.roles.indexOf(ROLES.SUBSCRIBE_APP_MARKETPLACE) !== -1 &&
+            userHasPortalRole(ROLES.SUBSCRIBE_APP_MARKETPLACE) &&
             dispatch(show(OVERLAYS.APPMARKETPLACE_REQUEST, appId))
           )
         }}
diff --git a/src/components/pages/AppMarketplace/components/AppListGroupView/index.tsx b/src/components/pages/AppMarketplace/components/AppListGroupView/index.tsx
index 9dade25b8..3fb0226ba 100644
--- a/src/components/pages/AppMarketplace/components/AppListGroupView/index.tsx
+++ b/src/components/pages/AppMarketplace/components/AppListGroupView/index.tsx
@@ -20,7 +20,7 @@
 import './AppListGroupView.scss'
 import { Box } from '@mui/material'
 import { Cards } from '@catena-x/portal-shared-components'
-import { multiMapBy } from 'utils/multiMapBy'
+import { multiMapBy } from 'utils/dataUtils'
 import { useTranslation } from 'react-i18next'
 import { AppListGroup } from '../AppListGroup'
 import NoItems from 'components/pages/NoItems'
diff --git a/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/index.tsx b/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/index.tsx
index 5ab7d8e42..d5ace5c51 100644
--- a/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/index.tsx
+++ b/src/components/pages/AppSubscription/AppSubscriptionDetailOverlay/index.tsx
@@ -42,7 +42,6 @@ import {
 } from 'features/appSubscription/appSubscriptionApiSlice'
 import ReleaseStepper from 'components/shared/basic/ReleaseProcess/stepper'
 import { SubscriptionStatus } from 'features/apps/types'
-import UserService from 'services/UserService'
 import { ROLES } from 'types/Constants'
 import { useState } from 'react'
 import './style.scss'
@@ -52,6 +51,7 @@ import { SubscriptionTypes } from 'components/shared/templates/Subscription'
 import { useFetchServiceSubDetailQuery } from 'features/serviceSubscription/serviceSubscriptionApiSlice'
 import HelpOutlineIcon from '@mui/icons-material/HelpOutline'
 import { Link } from 'react-router-dom'
+import { userHasPortalRole } from 'services/AccessService'
 
 interface AppSubscriptionDetailProps {
   openDialog: boolean
@@ -217,7 +217,7 @@ const AppSubscriptionDetailOverlay = ({
   const renderTenantUrl = (url: string) => {
     if (
       isAppSubscription &&
-      UserService.hasRole(ROLES.APPSTORE_EDIT) &&
+      userHasPortalRole(ROLES.APPSTORE_EDIT) &&
       data?.offerSubscriptionStatus === SubscriptionStatus.ACTIVE
     ) {
       return (
diff --git a/src/components/pages/AppUserManagement/components/AppUserDetailsTable/index.tsx b/src/components/pages/AppUserManagement/components/AppUserDetailsTable/index.tsx
index 5df911374..ca159019a 100644
--- a/src/components/pages/AppUserManagement/components/AppUserDetailsTable/index.tsx
+++ b/src/components/pages/AppUserManagement/components/AppUserDetailsTable/index.tsx
@@ -30,7 +30,7 @@ import {
 } from 'features/admin/appuserApiSlice'
 import type { TenantUser } from 'features/admin/userApiSlice'
 import { useTranslation } from 'react-i18next'
-import UserService from 'services/UserService'
+import { userHasPortalRole } from 'services/AccessService'
 
 export const AppUserDetailsTable = ({
   roles,
@@ -52,7 +52,7 @@ export const AppUserDetailsTable = ({
       addButtonDisabled={
         !roles ||
         roles.length === 0 ||
-        !UserService.hasRole(ROLES.MODIFY_USER_ACCOUNT)
+        !userHasPortalRole(ROLES.MODIFY_USER_ACCOUNT)
       }
       addButtonTooltip={
         roles && roles?.length <= 0
@@ -64,7 +64,7 @@ export const AppUserDetailsTable = ({
       fetchHookArgs={{ appId, expr, userRoleResponse, role: true }}
       onSearch={setExpr}
       onDetailsClick={
-        UserService.hasRole(ROLES.MODIFY_USER_ACCOUNT)
+        userHasPortalRole(ROLES.MODIFY_USER_ACCOUNT)
           ? (row: TenantUser) =>
               dispatch(show(OVERLAYS.EDIT_APP_USER_ROLES, row.companyUserId))
           : undefined
diff --git a/src/components/pages/CompanyCertificates/CompanyCertificateCard.tsx b/src/components/pages/CompanyCertificates/CompanyCertificateCard.tsx
index 03cd3e9ed..8b00f5547 100644
--- a/src/components/pages/CompanyCertificates/CompanyCertificateCard.tsx
+++ b/src/components/pages/CompanyCertificates/CompanyCertificateCard.tsx
@@ -32,13 +32,13 @@ import { useDispatch } from 'react-redux'
 import { OVERLAYS, ROLES } from 'types/Constants'
 import { show } from 'features/control/overlay'
 import dayjs from 'dayjs'
-import UserService from 'services/UserService'
 import AccessTimeOutlinedIcon from '@mui/icons-material/AccessTimeOutlined'
 import DeleteOutlinedIcon from '@mui/icons-material/DeleteOutlined'
 import CancelRoundedIcon from '@mui/icons-material/CancelRounded'
 import CheckCircleRoundedIcon from '@mui/icons-material/CheckCircleRounded'
 import WarningRoundedIcon from '@mui/icons-material/WarningRounded'
 import { type JSX } from 'react/jsx-runtime'
+import { userHasPortalRole } from 'services/AccessService'
 
 enum CompanyCertificateStatus {
   INACTIVE = 'INACTIVE',
@@ -171,7 +171,7 @@ export default function CompanyCertificateCard({
           borderRadius: '74px',
         }}
         onClick={handleDelete}
-        disabled={!UserService.hasRole(ROLES.SUBSCRIBE_SERVICE_MARKETPLACE)}
+        disabled={!userHasPortalRole(ROLES.DELETE_CERTIFICATES)}
       >
         <DeleteOutlinedIcon
           style={{
@@ -202,7 +202,7 @@ export default function CompanyCertificateCard({
               <Typography variant="label3" onClick={handleView}>
                 {t('content.companyCertificate.view')}{' '}
               </Typography>
-              {UserService.hasRole(ROLES.SUBSCRIBE_SERVICE_MARKETPLACE) &&
+              {userHasPortalRole(ROLES.DELETE_CERTIFICATES) &&
                 item.companyCertificateStatus ===
                   CompanyCertificateStatus.ACTIVE && (
                   <Typography variant="label3" onClick={handleDelete}>
diff --git a/src/components/pages/CompanyCertificates/index.tsx b/src/components/pages/CompanyCertificates/index.tsx
index a6f22f47a..c5490f5fd 100644
--- a/src/components/pages/CompanyCertificates/index.tsx
+++ b/src/components/pages/CompanyCertificates/index.tsx
@@ -28,7 +28,6 @@ import SortImage from 'components/shared/frame/SortImage'
 import './CompanyCertificate.scss'
 import { ROLES } from 'types/Constants'
 import CompanyCertificateElements from './CompanyCertificateElements'
-import UserService from 'services/UserService'
 import {
   type ComapnyCertificateData,
   useFetchCertificatesQuery,
@@ -38,6 +37,7 @@ import { Box } from '@mui/material'
 import UploadCompanyCertificate from './UploadCompanyCerificate'
 import LoadingProgress from 'components/shared/basic/LoadingProgress'
 import FileUploadOutlinedIcon from '@mui/icons-material/FileUploadOutlined'
+import { userHasPortalRole } from 'services/AccessService'
 
 interface TabButtonsType {
   buttonText: string
@@ -184,7 +184,7 @@ export default function CompanyCertificates(): JSX.Element {
                     setUploadModal(true)
                   }}
                   disabled={
-                    !UserService.hasRole(ROLES.UPLOAD_COMPANY_CERTIFICATE)
+                    !userHasPortalRole(ROLES.UPLOAD_COMPANY_CERTIFICATE)
                   }
                 >
                   {t('content.companyCertificate.uploadCertificate')}
diff --git a/src/components/pages/CompanySubscriptions/components/CompanySubscriptionTechnical/index.tsx b/src/components/pages/CompanySubscriptions/components/CompanySubscriptionTechnical/index.tsx
index 40cfae42f..a297ad1e5 100644
--- a/src/components/pages/CompanySubscriptions/components/CompanySubscriptionTechnical/index.tsx
+++ b/src/components/pages/CompanySubscriptions/components/CompanySubscriptionTechnical/index.tsx
@@ -22,7 +22,7 @@ import { useTranslation } from 'react-i18next'
 import { StaticTable, Typography } from '@catena-x/portal-shared-components'
 import { type ActiveSubscriptionDetails } from 'features/apps/types'
 import { PAGES, ROLES } from 'types/Constants'
-import UserService from 'services/UserService'
+import { userHasPortalRole } from 'services/AccessService'
 
 export default function CompanySubscriptionTechnical({
   detail,
@@ -52,7 +52,7 @@ export default function CompanySubscriptionTechnical({
         {
           icon: false,
           clickableLink:
-            UserService.hasRole(ROLES.VIEW_USER_ACCOUNT) &&
+            userHasPortalRole(ROLES.VIEW_USER_ACCOUNT) &&
             detail.technicalUserData.length
               ? `/${PAGES.USER_DETAILS}/${detail.technicalUserData[0].id}`
               : undefined,
diff --git a/src/components/pages/CompanyWallet/RuleCard.tsx b/src/components/pages/CompanyWallet/RuleCard.tsx
index db917ab0c..9d77d6b92 100644
--- a/src/components/pages/CompanyWallet/RuleCard.tsx
+++ b/src/components/pages/CompanyWallet/RuleCard.tsx
@@ -29,6 +29,8 @@ import { useTranslation } from 'react-i18next'
 import { Box, Grid } from '@mui/material'
 import SettingsBackupRestoreIcon from '@mui/icons-material/SettingsBackupRestore'
 import { getAssetBase } from 'services/EnvironmentService'
+import { userHasSsiCredentialRole } from 'services/AccessService'
+import { ROLES } from 'types/Constants'
 
 type Hash<T> = Record<string, T>
 
@@ -61,6 +63,7 @@ export default function RuleCard({
 
   const canShowRevoke = (item: WalletContent) => {
     return (
+      userHasSsiCredentialRole(ROLES.REVOKE_CREDENTIALS_ISSUER) &&
       item.status === CredentialSubjectStatus.ACTIVE &&
       item?.credentialType !== CredentialType.MEMBERSHIP &&
       item.credentialType !== CredentialType.BUSINESS_PARTNER_NUMBER
diff --git a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
index eb229ac93..cc8169467 100644
--- a/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
+++ b/src/components/pages/EdcConnector/ConnectorDetailsOverlay.tsx
@@ -43,8 +43,8 @@ import { error, success } from 'services/NotifyService'
 import EditIcon from '@mui/icons-material/Edit'
 import Patterns from 'types/Patterns'
 import { download } from 'utils/downloadUtils'
-import UserService from 'services/UserService'
 import { ROLES } from 'types/Constants'
+import { userHasPortalRole } from 'services/AccessService'
 
 interface DeleteConfirmationOverlayProps {
   openDialog?: boolean
@@ -374,7 +374,7 @@ const ConnectorDetailsOverlay = ({
                       setEnableConnectorUrl(false)
                       setEnableUrlApiErrorMsg(false)
                     }}
-                    disabled={!UserService.hasRole(ROLES.MODIFY_CONNECTORS)}
+                    disabled={!userHasPortalRole(ROLES.MODIFY_CONNECTORS)}
                   >
                     <EditIcon
                       sx={{
diff --git a/src/components/pages/Home/components/MenuInfo/index.tsx b/src/components/pages/Home/components/MenuInfo/index.tsx
index 4096f0b32..8bda85d29 100644
--- a/src/components/pages/Home/components/MenuInfo/index.tsx
+++ b/src/components/pages/Home/components/MenuInfo/index.tsx
@@ -28,7 +28,7 @@ import CloseIcon from '@mui/icons-material/Close'
 import { MobileMenu } from 'components/shared/MobileMenu'
 import { Drawer } from '@mui/material'
 
-export const MenuInfo = ({ main }: { main: Tree[] }) => {
+export const MenuInfo = ({ main }: { main: Tree[] | undefined }) => {
   const { t } = useTranslation()
   const visible = useSelector(appearMenuSelector)
   const dispatch = useDispatch()
diff --git a/src/components/pages/MyAccount/index.tsx b/src/components/pages/MyAccount/index.tsx
index fd64e2959..b2f2031e3 100644
--- a/src/components/pages/MyAccount/index.tsx
+++ b/src/components/pages/MyAccount/index.tsx
@@ -25,8 +25,7 @@ import {
   Typography,
   PageHeader,
 } from '@catena-x/portal-shared-components'
-import type { RootState } from 'features/store'
-import { useSelector, useDispatch } from 'react-redux'
+import { useDispatch } from 'react-redux'
 import { useTranslation } from 'react-i18next'
 import Accordion from '@mui/material/Accordion'
 import AccordionSummary from '@mui/material/AccordionSummary'
@@ -39,11 +38,10 @@ import { useFetchOwnUserDetailsQuery } from 'features/admin/userApiSlice'
 import { OVERLAYS } from 'types/Constants'
 import { show } from 'features/control/overlay'
 import { success } from 'services/NotifyService'
+import UserService from 'services/UserService'
 
 export default function MyAccount() {
   const { t } = useTranslation()
-  const parsedToken = useSelector((state: RootState) => state.user.parsedToken)
-  const token = useSelector((state: RootState) => state.user.token)
   const { data } = useFetchOwnUserDetailsQuery()
   const dispatch = useDispatch()
 
@@ -65,7 +63,7 @@ export default function MyAccount() {
           <Button
             color="secondary"
             onClick={async () => {
-              await navigator.clipboard.writeText(token ?? '')
+              await navigator.clipboard.writeText(UserService.getToken() ?? '')
               success(t('content.account.copy_to_clipboard_success'))
             }}
             size="small"
@@ -89,7 +87,12 @@ export default function MyAccount() {
           </Box>
         </Box>
       </section>
-      {data && <UserDetailInfo user={data} parsedToken={parsedToken} />}
+      {data && (
+        <UserDetailInfo
+          user={data}
+          parsedToken={UserService.getParsedToken()}
+        />
+      )}
 
       {/* TODO: DEV only needs to be removed when going PROD */}
       <section>
@@ -102,7 +105,7 @@ export default function MyAccount() {
             <Typography>{t('content.account.token')}</Typography>
           </AccordionSummary>
           <AccordionDetails sx={{ marginBottom: '20px' }}>
-            <pre>{JSON.stringify(parsedToken, null, 2)}</pre>
+            <pre>{JSON.stringify(UserService.getParsedToken(), null, 2)}</pre>
           </AccordionDetails>
         </Accordion>
       </section>
diff --git a/src/components/pages/Organization/MyCompanyInfoComponent.tsx b/src/components/pages/Organization/MyCompanyInfoComponent.tsx
index 06fe9cf4c..719ec6427 100644
--- a/src/components/pages/Organization/MyCompanyInfoComponent.tsx
+++ b/src/components/pages/Organization/MyCompanyInfoComponent.tsx
@@ -3,7 +3,7 @@ import { Box } from '@mui/material'
 import { KeyValueView } from 'components/shared/basic/KeyValueView'
 import { useFetchOwnCompanyDetailsQuery } from 'features/admin/userApiSlice'
 import { useTranslation } from 'react-i18next'
-import UserService from 'services/UserService'
+import { userHasPortalRole } from 'services/AccessService'
 import { ROLES, PAGES } from 'types/Constants'
 
 export default function MyCompanyInfoComponent({
@@ -99,7 +99,7 @@ export default function MyCompanyInfoComponent({
             title={t('content.organization.companyRoles.title')}
             items={companyRoleData}
             editLink={
-              editable && UserService.hasRole(ROLES.UPDATE_COMPANY_ROLE)
+              editable && userHasPortalRole(ROLES.UPDATE_COMPANY_ROLE)
                 ? `/${PAGES.COMPANY_ROLE}`
                 : ''
             }
diff --git a/src/components/pages/SemanticHub/ModelDetailDialog.tsx b/src/components/pages/SemanticHub/ModelDetailDialog.tsx
index 6935e7666..37505da97 100644
--- a/src/components/pages/SemanticHub/ModelDetailDialog.tsx
+++ b/src/components/pages/SemanticHub/ModelDetailDialog.tsx
@@ -47,12 +47,12 @@ import {
   changeOpenApiUrl,
   deleteSemanticModelById,
 } from 'features/semanticModels/actions'
-import UserService from 'services/UserService'
 import { ROLES } from 'types/Constants'
 import { getSemanticApiBase } from 'services/EnvironmentService'
 import { getHeaders } from 'services/RequestService'
 import { Status } from 'features/semanticModels/types'
 import type { AppDispatch } from 'features/store'
+import { userHasSemanticHubRole } from 'services/AccessService'
 
 interface ModelDetailDialogProps {
   show: boolean
@@ -113,7 +113,7 @@ const ModelDetailDialog = ({ show, onClose }: ModelDetailDialogProps) => {
           console.log(err)
         })
       setShowDeleteBtn(
-        UserService.hasRole(ROLES.SEMANTICHUB_DELETE) &&
+        userHasSemanticHubRole(ROLES.SEMANTICHUB_DELETE) &&
           model.status === Status.Draft
       )
     }
diff --git a/src/components/pages/SemanticHub/index.tsx b/src/components/pages/SemanticHub/index.tsx
index c7ac20138..a19960d2e 100644
--- a/src/components/pages/SemanticHub/index.tsx
+++ b/src/components/pages/SemanticHub/index.tsx
@@ -34,11 +34,11 @@ import { fetchSemanticModelById } from 'features/semanticModels/actions'
 import AddCircleOutlineIcon from '@mui/icons-material/AddCircleOutline'
 import ModelImportDialog from './ModelImportDialog'
 import { semanticModelsSelector } from 'features/semanticModels/slice'
-import UserService from 'services/UserService'
 import { ROLES } from 'types/Constants'
 import { useNavigate, useParams } from 'react-router-dom'
 import { getAssetBase } from 'services/EnvironmentService'
 import type { AppDispatch } from 'features/store'
+import { userHasSemanticHubRole } from 'services/AccessService'
 
 export default function SemanticHub() {
   const { t } = useTranslation()
@@ -137,7 +137,7 @@ export default function SemanticHub() {
               <Typography variant="body2" mb={4}>
                 {t('content.semantichub.introText_1')}
               </Typography>
-              {UserService.hasRole(ROLES.SEMANTICHUB_ADD) && (
+              {userHasSemanticHubRole(ROLES.SEMANTICHUB_ADD) && (
                 <Button
                   onClick={() => {
                     setImportModel(true)
diff --git a/src/components/pages/ServiceMarketplaceDetail/components/MarketplaceHeader/index.tsx b/src/components/pages/ServiceMarketplaceDetail/components/MarketplaceHeader/index.tsx
index d2ba478d0..c9f585525 100644
--- a/src/components/pages/ServiceMarketplaceDetail/components/MarketplaceHeader/index.tsx
+++ b/src/components/pages/ServiceMarketplaceDetail/components/MarketplaceHeader/index.tsx
@@ -25,12 +25,12 @@ import { useParams } from 'react-router-dom'
 import type { ServiceRequest } from 'features/serviceMarketplace/serviceApiSlice'
 import { show } from 'features/control/overlay'
 import { OVERLAYS, ROLES } from 'types/Constants'
-import UserService from 'services/UserService'
 import './MarketplaceHeader.scss'
 import { setSuccessType } from 'features/serviceMarketplace/slice'
 import { getAssetBase } from 'services/EnvironmentService'
 import { Box } from '@mui/material'
 import { ServiceTypeIdsEnum } from 'features/serviceManagement/apiSlice'
+import { userHasPortalRole } from 'services/AccessService'
 
 export default function MarketplaceHeader({
   item,
@@ -65,11 +65,7 @@ export default function MarketplaceHeader({
         <Button
           color="primary"
           className="subscribe-btn"
-          disabled={
-            UserService.hasRole(ROLES.SUBSCRIBE_SERVICE_MARKETPLACE)
-              ? false
-              : true
-          }
+          disabled={!userHasPortalRole(ROLES.SUBSCRIBE_SERVICE_MARKETPLACE)}
           onClick={() => dispatch(show(OVERLAYS.SERVICE_REQUEST, serviceId))}
         >
           {t('content.appdetail.subscribe')}
diff --git a/src/components/pages/UserManagement/ActiveUserTable/index.tsx b/src/components/pages/UserManagement/ActiveUserTable/index.tsx
index 3ceb3eb85..1ba5188c4 100644
--- a/src/components/pages/UserManagement/ActiveUserTable/index.tsx
+++ b/src/components/pages/UserManagement/ActiveUserTable/index.tsx
@@ -28,7 +28,7 @@ import { useDispatch } from 'react-redux'
 import { show } from 'features/control/overlay'
 import { OVERLAYS, ROLES } from 'types/Constants'
 import { useState } from 'react'
-import UserService from 'services/UserService'
+import { userHasPortalRole } from 'services/AccessService'
 
 export const ActiveUserTable = ({
   addUserResponse,
@@ -43,13 +43,13 @@ export const ActiveUserTable = ({
     <UserList
       sectionTitle={'content.usermanagement.table.headline'}
       addButtonLabel={
-        UserService.hasRole(ROLES.USERMANAGEMENT_ADD)
+        userHasPortalRole(ROLES.USERMANAGEMENT_ADD)
           ? 'content.usermanagement.table.add'
           : ''
       }
       addButtonClick={() => dispatch(show(OVERLAYS.ADD_USER))}
       addMultipleButtonLabel={
-        UserService.hasRole(ROLES.USERMANAGEMENT_ADD)
+        userHasPortalRole(ROLES.USERMANAGEMENT_ADD)
           ? 'content.usermanagement.table.addMultiple'
           : ''
       }
diff --git a/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx b/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx
index bd0bfe2d7..bc703913e 100644
--- a/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx
+++ b/src/components/pages/UserManagement/StageSubNavigation/StageSubNavigation.tsx
@@ -22,8 +22,8 @@ import { useEffect } from 'react'
 import { SubNavigation } from '@catena-x/portal-shared-components'
 import { useTranslation } from 'react-i18next'
 import { useNavigate } from 'react-router-dom'
-import UserService from 'services/UserService'
 import { PAGES, ROLES } from 'types/Constants'
+import { userHasPortalRole } from 'services/AccessService'
 
 export const StageSubNavigation = () => {
   const { t } = useTranslation()
@@ -47,7 +47,7 @@ export const StageSubNavigation = () => {
   return (
     <SubNavigation
       buttonLabel={
-        (UserService.hasRole(ROLES.TECH_USER_VIEW) &&
+        (userHasPortalRole(ROLES.TECH_USER_VIEW) &&
           t('navigation.subNavigation.buttonLabel')) ||
         undefined
       }
diff --git a/src/components/shared/basic/KeyValueView/index.tsx b/src/components/shared/basic/KeyValueView/index.tsx
index 10bbd573b..54a319a74 100644
--- a/src/components/shared/basic/KeyValueView/index.tsx
+++ b/src/components/shared/basic/KeyValueView/index.tsx
@@ -40,18 +40,21 @@ interface KeyValueViewProps {
   editLink?: string
 }
 
-const renderValue = (value: DataValue) => (
-  <Typography
-    sx={{
-      fontSize: '14px',
-      color: 'gray',
-      margin: 'auto 0px',
-      wordBreak: 'break-all',
-    }}
-  >
-    {value}
-  </Typography>
-)
+const renderValue = (value: DataValue) =>
+  typeof value === 'string' ? (
+    <Typography
+      sx={{
+        fontSize: '14px',
+        color: 'gray',
+        margin: 'auto 0px',
+        wordBreak: 'break-all',
+      }}
+    >
+      {value}
+    </Typography>
+  ) : (
+    <Box sx={{ margin: 'auto 0px' }}>{value}</Box>
+  )
 
 export const KeyValueView = ({
   cols,
diff --git a/src/components/shared/frame/Header/index.tsx b/src/components/shared/frame/Header/index.tsx
index b0ce318af..c792ec88d 100644
--- a/src/components/shared/frame/Header/index.tsx
+++ b/src/components/shared/frame/Header/index.tsx
@@ -50,7 +50,13 @@ import './Header.scss'
 import RegistrationReviewContent from './RegistrationReviewOverlay/RegistrationReviewContent'
 import RegistrationDeclinedOverlay from './RegistrationDeclinedOverlay'
 
-export const Header = ({ main, user }: { main: Tree[]; user: string[] }) => {
+export const Header = ({
+  main,
+  user,
+}: {
+  main: Tree[] | undefined
+  user: string[]
+}) => {
   const { t } = useTranslation()
   const dispatch = useDispatch()
   const theme = useTheme()
diff --git a/src/features/store.ts b/src/features/store.ts
index 6c5739547..0c44cc82c 100644
--- a/src/features/store.ts
+++ b/src/features/store.ts
@@ -24,7 +24,6 @@ import admin from './admin'
 import apps from './apps'
 import control from './control'
 import info from './info'
-import userSliceDep from './user/slice'
 import partnerNetworkSlice from './partnerNetwork/slice'
 import connectorSlice from './connector/slice'
 import notificationSliceDep from './notification/slice'
@@ -95,7 +94,6 @@ export const reducers = {
   userRole: userRoleSlice.reducer,
   semanticModels: modelsSlice.reducer,
   companyRoles: updateCompanyRoleSlice.reducer,
-  user: userSliceDep,
   partnerNetwork: partnerNetworkSlice.reducer,
   connector: connectorSlice.reducer,
   notification: notificationSliceDep.reducer,
diff --git a/src/features/user/slice.ts b/src/features/user/slice.ts
deleted file mode 100644
index 1bdaa074d..000000000
--- a/src/features/user/slice.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023 BMW Group AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-import { createSlice, type PayloadAction } from '@reduxjs/toolkit'
-import type { RootState } from 'features/store'
-import type { IUser } from './types'
-
-const initialState: IUser = {
-  userName: '',
-  name: '',
-  email: '',
-  company: '',
-  tenant: '',
-  roles: [],
-  isAdmin: false,
-}
-
-const userSlice = createSlice({
-  name: 'user',
-  initialState,
-  reducers: {
-    setLoggedUser: (_state: IUser, action: PayloadAction<IUser>) => {
-      return action.payload
-    },
-  },
-})
-
-export const { setLoggedUser } = userSlice.actions
-export const userSelector = (state: RootState): IUser => state.user
-
-export default userSlice.reducer
diff --git a/src/features/user/types.ts b/src/features/user/types.ts
deleted file mode 100644
index 654dd5483..000000000
--- a/src/features/user/types.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/********************************************************************************
- * Copyright (c) 2023 BMW Group AG
- * Copyright (c) 2023 Contributors to the Eclipse Foundation
- *
- * See the NOTICE file(s) distributed with this work for additional
- * information regarding copyright ownership.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Apache License, Version 2.0 which is available at
- * https://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * SPDX-License-Identifier: Apache-2.0
- ********************************************************************************/
-
-import { type KeycloakTokenParsed } from 'keycloak-js'
-
-export interface IUser {
-  userName: string
-  name: string
-  email: string
-  company: string
-  tenant: string
-  roles: Array<string>
-  isAdmin: boolean
-  token?: string
-  parsedToken?: KeycloakTokenParsed
-}
diff --git a/src/index.tsx b/src/index.tsx
index e5606f6e2..238e775a3 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -25,7 +25,6 @@ import { store } from 'features/store'
 import AccessService from 'services/AccessService'
 import I18nService from 'services/I18nService'
 import UserService from 'services/UserService'
-import { AuthProvider } from 'components/AuthProvider'
 import AuthorizingRouter from 'components/AuthorizingRouter'
 import {
   SharedThemeProvider,
@@ -35,15 +34,13 @@ import {
 I18nService.init()
 AccessService.init()
 
-UserService.init((user) => {
+UserService.init(() => {
   createRoot(document.getElementById('app')!).render(
     <StrictMode>
       <SharedCssBaseline />
       <Provider store={store}>
         <SharedThemeProvider>
-          <AuthProvider user={user}>
-            <AuthorizingRouter />
-          </AuthProvider>
+          <AuthorizingRouter />
         </SharedThemeProvider>
       </Provider>
     </StrictMode>
diff --git a/src/services/AccessService.tsx b/src/services/AccessService.tsx
index 69e5549cd..fa36be23c 100644
--- a/src/services/AccessService.tsx
+++ b/src/services/AccessService.tsx
@@ -18,8 +18,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import type { IAction, IOverlay, IPage, Tree } from 'types/MainTypes'
-import UserService from './UserService'
+import type { IAction, IPage, RestrictedItem, Tree } from 'types/MainTypes'
 import { Route } from 'react-router-dom'
 import AppInfo from 'components/overlays/AppInfo'
 import AddBPN from 'components/overlays/AddBPN'
@@ -70,17 +69,57 @@ import CompanyCertificateDetails from 'components/overlays/CompanyCertificateDet
 import DeleteCompanyCertificateConfirmationOverlay from 'components/overlays/CompanyCertificateDetails/DeleteCompanyCertificateConfirmationOverlay'
 import { DisableManagedIDP } from 'components/overlays/EnableIDP/DisableManagedIdp'
 import { DeleteManagedIDP } from 'components/overlays/IDPDelete/DeleteManagedIdp'
+import type { KeycloakResourceAccess } from 'keycloak-js'
+import { intersectAccess } from 'utils/dataUtils'
+import UserService from './UserService'
+import {
+  getClientId,
+  getClientIdBpdm,
+  getClientIdMiw,
+  getClientIdRegistration,
+  getClientIdSemantic,
+  getClientIdSsiCredential,
+} from './EnvironmentService'
 import CSVUploadOverlay from 'components/overlays/CSVUploadOverlay'
 
 let pageMap: { [page: string]: IPage }
 let actionMap: { [action: string]: IAction }
-let overlayMap: { [overlay: string]: IOverlay }
+let overlayMap: { [overlay: string]: RestrictedItem }
+
+export const userHasAccess = (required: KeycloakResourceAccess): boolean =>
+  Object.keys(intersectAccess(required, UserService.getAccess())).length > 0
+
+export const userHasClientRole = (
+  client: string,
+  roles: string | Array<string>
+): boolean =>
+  userHasAccess({ [client]: { roles: Array.isArray(roles) ? roles : [roles] } })
+
+export const userHasPortalRole = (roles: string | Array<string>): boolean =>
+  userHasClientRole(getClientId(), roles)
+
+export const userHasRegistrationRole = (
+  roles: string | Array<string>
+): boolean => userHasClientRole(getClientIdRegistration(), roles)
+
+export const userHasSemanticHubRole = (
+  roles: string | Array<string>
+): boolean => userHasClientRole(getClientIdSemantic(), roles)
+
+export const userHasBpdmRole = (roles: string | Array<string>): boolean =>
+  userHasClientRole(getClientIdBpdm(), roles)
+
+export const userHasMiwRole = (roles: string | Array<string>): boolean =>
+  userHasClientRole(getClientIdMiw(), roles)
+
+export const userHasSsiCredentialRole = (
+  roles: string | Array<string>
+): boolean => userHasClientRole(getClientIdSsiCredential(), roles)
 
-const checkAccess = (element: { name: string; role?: string }): boolean => {
-  if (!element) return false // page doesn't exist
-  const role = element.role
-  if (!role) return true // no permission required for this page
-  return UserService.hasRole(role) // check if user has the required permission
+const checkAccess = (element: RestrictedItem): boolean => {
+  if (!element) return false // item doesn't exist
+  if (!element.allowTo) return true // no permission required for this item
+  return element.allowTo() // check if permission is granted
 }
 
 export const hasAccess = (page: string) => checkAccess(pageMap[page])
@@ -94,9 +133,7 @@ export const hasAccessOverlay = (overlay: string) =>
 const accessToMenu = (menu: string[]) =>
   menu.filter((page: string) => hasAccess(page))
 
-// Add an ESLint exception until there is a solution
-// eslint-disable-next-line
-const accessToMenuTree = (menu: Tree[] | undefined): any =>
+const accessToMenuTree = (menu: Tree[] | undefined): Tree[] | undefined =>
   menu
     ?.filter((item: Tree) => hasAccess(item.name))
     .map((item: Tree) => ({
@@ -236,7 +273,7 @@ function init() {
     {}
   )
   overlayMap = ALL_OVERLAYS.reduce(
-    (map: { [overlay: string]: IOverlay }, overlay: IOverlay) => {
+    (map: { [overlay: string]: RestrictedItem }, overlay: RestrictedItem) => {
       map[overlay.name] = overlay
       return map
     },
diff --git a/src/services/EnvironmentService.ts b/src/services/EnvironmentService.ts
index 47f2b0326..ef7debf74 100644
--- a/src/services/EnvironmentService.ts
+++ b/src/services/EnvironmentService.ts
@@ -27,8 +27,12 @@ export const getRealm = () => ENV.REALM ?? ''
 
 export const getClientId = () => ENV.CLIENT_ID ?? ''
 
+export const getClientIdRegistration = () => ENV.CLIENT_ID_REGISTRATION ?? ''
+
 export const getClientIdSemantic = () => ENV.CLIENT_ID_SEMANTIC ?? ''
 
+export const getClientIdBpdm = () => ENV.CLIENT_ID_BPDM ?? ''
+
 export const getClientIdMiw = () => ENV.CLIENT_ID_MIW ?? ''
 
 export const getClientIdSsiCredential = () => ENV.CLIENT_ID_SSI_CREDENTIAL ?? ''
@@ -55,7 +59,9 @@ const EnvironmentService = {
   getRequireHttpsUrlPattern,
   getRealm,
   getClientId,
+  getClientIdRegistration,
   getClientIdSemantic,
+  getClientIdBpdm,
   getClientIdMiw,
   getClientIdSsiCredential,
   getCentralIdp,
diff --git a/src/services/UserService.ts b/src/services/UserService.ts
index 339df4cae..1cd6db7e9 100644
--- a/src/services/UserService.ts
+++ b/src/services/UserService.ts
@@ -18,21 +18,9 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import Keycloak from 'keycloak-js'
-import type { IUser } from 'features/user/types'
-import { ROLES } from 'types/Constants'
-import {
-  getCentralIdp,
-  getClientId,
-  getClientIdMiw,
-  getClientIdSsiCredential,
-  getClientIdSemantic,
-  getMiwBase,
-  getRealm,
-} from './EnvironmentService'
+import Keycloak, { type KeycloakResourceAccess } from 'keycloak-js'
+import { getCentralIdp, getClientId, getRealm } from './EnvironmentService'
 import { type LogData, error, info } from './LogService'
-import { store } from 'features/store'
-import { setLoggedUser } from 'features/user/slice'
 
 const keycloakConfig: Keycloak.KeycloakConfig = {
   url: getCentralIdp(),
@@ -40,41 +28,19 @@ const keycloakConfig: Keycloak.KeycloakConfig = {
   clientId: getClientId(),
 }
 
-const keycloakConfigSemantic: Keycloak.KeycloakConfig = {
-  url: getCentralIdp(),
-  realm: getRealm(),
-  clientId: getClientIdSemantic(),
-}
-
-const keycloakConfigMIW: Keycloak.KeycloakConfig = {
-  url: getMiwBase(),
-  realm: getRealm(),
-  clientId: getClientIdMiw(),
-}
-
-const keycloakConfigSsiCredential: Keycloak.KeycloakConfig = {
-  url: getMiwBase(),
-  realm: getRealm(),
-  clientId: getClientIdSsiCredential(),
-}
-
-// Add an ESLint exception until there is a solution
-
 const KC = new Keycloak(keycloakConfig)
 
 const update = () => {
-  //info(`${getUsername()} updating token`)
   KC.updateToken(600)
     .then((refreshed: boolean) => {
       info(`${getUsername()} token refreshed ${refreshed}`)
-      store.dispatch(setLoggedUser(getLoggedUser()))
     })
     .catch(() => {
       error(`${getUsername()} token refresh failed`)
     })
 }
 
-const init = (onAuthenticatedCallback: (loggedUser: IUser) => void) => {
+const init = (onAuthenticatedCallback: () => void) => {
   KC.init({
     onLoad: 'login-required',
     pkceMethod: 'S256',
@@ -82,8 +48,7 @@ const init = (onAuthenticatedCallback: (loggedUser: IUser) => void) => {
     .then((authenticated: boolean) => {
       if (authenticated) {
         info(`${getUsername()} authenticated`)
-        onAuthenticatedCallback(getLoggedUser())
-        store.dispatch(setLoggedUser(getLoggedUser()))
+        onAuthenticatedCallback()
       } else {
         error(`${getUsername()} authentication failed`)
       }
@@ -110,58 +75,21 @@ const getUsername = () => KC.tokenParsed?.preferred_username
 
 const getName = () => KC.tokenParsed?.name
 
-const getEmail = () => KC.tokenParsed?.email
-
 const getCompany = () => KC.tokenParsed?.organisation
 
-const getTenant = () => KC.tokenParsed?.tenant
-
-// Add a more sustainable logic for role management with multiple clients
-// not sustainable because client roles need to be unique across all clients
-const getRoles = (): Array<string> =>
-  KC.tokenParsed?.resource_access?.[keycloakConfig.clientId]?.roles
-    .concat(
-      KC.tokenParsed?.resource_access[keycloakConfigSemantic.clientId]?.roles
-    )
-    .concat(KC.tokenParsed?.resource_access[keycloakConfigMIW.clientId]?.roles)
-    .concat(
-      KC.tokenParsed?.resource_access[keycloakConfigSsiCredential.clientId]
-        ?.roles
-    ) ?? []
-
-const hasRole = (role: string) => getRoles()?.includes(role)
-
-const isAdmin = (): boolean => hasRole(ROLES.CX_ADMIN) ?? false
-
-const isLoggedIn = () => !!KC.token
-
-const getLoggedUser = (): IUser => ({
-  userName: getUsername(),
-  name: getName(),
-  email: getEmail(),
-  company: getCompany(),
-  tenant: getTenant(),
-  roles: getRoles(),
-  isAdmin: isAdmin(),
-  token: getToken(),
-  parsedToken: getParsedToken(),
-})
+const getAccess = (): KeycloakResourceAccess =>
+  KC.tokenParsed?.resource_access ?? {}
 
 const UserService = {
   doLogin,
   doLogout,
+  getAccess,
   getToken,
   getParsedToken,
-  getEmail,
-  getUsername,
   getName,
+  getUsername,
   getCompany,
-  getTenant,
-  getRoles,
-  hasRole,
   init,
-  isAdmin,
-  isLoggedIn,
 }
 
 export default UserService
diff --git a/src/types/Config.tsx b/src/types/Config.tsx
index 1918ea813..c0cdda614 100644
--- a/src/types/Config.tsx
+++ b/src/types/Config.tsx
@@ -52,7 +52,7 @@ import UserManagement from 'components/pages/UserManagement'
 import UserDetails from 'components/pages/UserDetail'
 import { Route } from 'react-router-dom'
 import { ACTIONS, HINTS, OVERLAYS, PAGES, ROLES } from './Constants'
-import type { IAction, IOverlay, IPage } from './MainTypes'
+import type { IAction, RestrictedItem, IPage } from './MainTypes'
 import AppUserManagement from 'components/pages/AppUserManagement'
 import IDPManagement from 'components/pages/IDPManagement'
 import AppReleaseProcessForm from 'components/pages/AppReleaseProcess/components'
@@ -87,6 +87,13 @@ import { OSPConsent } from 'components/pages/OSPConsent'
 import CompanySubscriptions from 'components/pages/CompanySubscriptions'
 import CompanySubscriptionDetail from 'components/pages/CompanySubscriptions/CompanySubscriptionDetail'
 import CompanyData from 'components/pages/CompanyData'
+import {
+  userHasBpdmRole,
+  userHasPortalRole,
+  userHasRegistrationRole,
+  userHasSemanticHubRole,
+  userHasSsiCredentialRole,
+} from 'services/AccessService'
 import OnboardingServiceProvider from 'components/pages/OnboardingServiceProvider/OnboardingServiceProvider'
 
 /**
@@ -94,14 +101,18 @@ import OnboardingServiceProvider from 'components/pages/OnboardingServiceProvide
  *
  * this is the main application config table. Each entry has at least:
  * name - name of the page used as application route (without leading '/')
- * role - role required to access this page on the front end
+ * allowTo - function to determine if the current user can access resource
  * element - either a JSX Element that renders the page or a custom router setup
  *           for that page. By default it will create a simple route name -> element
  */
 export const ALL_PAGES: IPage[] = [
   { name: PAGES.ROOT, element: <Home /> },
   { name: PAGES.HOME, element: <Home /> },
-  { name: PAGES.REGISTRATION, element: <Redirect path="registration" /> },
+  {
+    name: PAGES.REGISTRATION,
+    allowTo: () => userHasRegistrationRole(ROLES.VIEW_REGISTRATION),
+    element: <Redirect path="registration" />,
+  },
   {
     name: PAGES.HELP,
     element: <Redirect path="documentation" tab={'documentation'} />,
@@ -110,28 +121,24 @@ export const ALL_PAGES: IPage[] = [
     name: PAGES.DOCUMENTATION,
     element: <Redirect path="documentation" tab={'documentation'} />,
   },
-  {
-    name: PAGES.STORYBOOK,
-    element: <Redirect path="_storybook" tab={'storybook'} />,
-  },
   {
     name: PAGES.MARKETPLACE,
-    role: ROLES.APPSTORE_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW),
     element: <AppMarketplace />,
   },
   {
     name: PAGES.APP_MARKETPLACE,
-    role: ROLES.APPSTORE_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW),
     element: <AppMarketplace />,
   },
   {
     name: PAGES.SERVICE_MARKETPLACE,
-    role: ROLES.APPSTORE_VIEW_SERVICES,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW_SERVICES),
     element: <ServiceMarketplace />,
   },
   {
     name: PAGES.SERVICE_MARKETPLACE_DETAIL,
-    role: ROLES.APPSTORE_VIEW_SERVICES,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW_SERVICES),
     isRoute: true,
     element: (
       <Route
@@ -146,7 +153,7 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.APP_DETAIL,
-    role: ROLES.APPSTORE_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW),
     isRoute: true,
     element: (
       <Route
@@ -161,12 +168,12 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.DATA_MANAGEMENT,
-    role: ROLES.SEMANTICHUB_VIEW,
+    allowTo: () => userHasSemanticHubRole(ROLES.SEMANTICHUB_VIEW),
     element: <SemanticHub />,
   },
   {
     name: PAGES.SEMANTICHUB,
-    role: ROLES.SEMANTICHUB_VIEW,
+    allowTo: () => userHasSemanticHubRole(ROLES.SEMANTICHUB_VIEW),
     isRoute: true,
     element: (
       <Route
@@ -181,87 +188,93 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.CONNECTOR,
-    role: ROLES.CONNECTOR_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.CONNECTOR_SETUP),
     element: <Connector />,
   },
   {
     name: PAGES.ACCOUNT,
-    role: ROLES.MY_ACCOUNT,
+    allowTo: () => userHasPortalRole(ROLES.MY_ACCOUNT),
     element: <MyAccount />,
   },
   {
     name: PAGES.NOTIFICATIONS,
-    role: ROLES.NOTIFICATION_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.NOTIFICATION_VIEW),
     element: <NotificationCenter />,
   },
   {
     name: PAGES.ORGANIZATION,
-    role: ROLES.MY_ORGANIZATION_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.MY_ORGANIZATION_VIEW),
     element: <Organization />,
   },
   {
     name: PAGES.PARTNER_NETWORK,
-    role: ROLES.PARTNER_NETWORK_VIEW,
+    allowTo: () => userHasBpdmRole(ROLES.READ_PARTNER),
     element: <PartnerNetwork />,
   },
   {
     name: PAGES.APP_MANAGEMENT,
-    role: ROLES.APPMANAGEMENT_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPMANAGEMENT_VIEW),
     element: <AppOverview />,
   },
   {
     name: PAGES.SERVICE_MANAGEMENT,
-    role: ROLES.SERVICEMANAGEMENT_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.SERVICEMANAGEMENT_VIEW),
     element: <ServiceOverview />,
   },
   {
     name: PAGES.APP_OVERVIEW,
-    role: ROLES.APPOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPOVERVIEW_VIEW),
     element: <AppOverview />,
   },
   {
     name: PAGES.APP_OVERVIEW_NEW,
-    role: ROLES.APPOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPOVERVIEW_VIEW),
     element: <AppOverviewNew />,
   },
   {
     name: PAGES.SERVICE_OVERVIEW,
-    role: ROLES.SERVICEOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.SERVICEOVERVIEW_VIEW),
     element: <ServiceOverview />,
   },
   {
     name: PAGES.APP_RELEASE_PROCESS,
-    role: ROLES.APPOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPOVERVIEW_VIEW),
     element: <AppReleaseProcess />,
   },
   {
     name: PAGES.SERVICE_RELEASE_PROCESS,
-    role: ROLES.VIEW_SERVICE_RELEASE,
+    allowTo: () => userHasPortalRole(ROLES.VIEW_SERVICE_RELEASE),
     element: <ServiceReleaseProcess />,
   },
   {
     name: PAGES.APP_SUBSCRIPTION,
-    role: ROLES.APP_MANAGEMENT,
+    allowTo: () => userHasPortalRole(ROLES.APP_MANAGEMENT),
     element: <AppSubscription />,
   },
   {
     name: PAGES.SERVICE_SUBSCRIPTION,
-    role: ROLES.SERVICE_SUBSCRIPTION_MANAGEMENT,
+    allowTo: () => userHasPortalRole(ROLES.SERVICE_SUBSCRIPTION_MANAGEMENT),
     element: <ServiceSubscription />,
   },
   {
     name: PAGES.APP_ADMIN_BOARD,
-    role: ROLES.APPROVE_APP_RELEASE || ROLES.DECLINE_APP_RELEASE,
+    allowTo: () =>
+      userHasPortalRole([ROLES.APPROVE_APP_RELEASE, ROLES.DECLINE_APP_RELEASE]),
     element: <AdminBoard />,
   },
   {
     name: PAGES.SERVICE_ADMIN_BOARD,
-    role: ROLES.APPROVE_SERVICE_RELEASE || ROLES.DECLINE_SERVICE_RELEASE,
+    allowTo: () =>
+      userHasPortalRole([
+        ROLES.APPROVE_SERVICE_RELEASE,
+        ROLES.DECLINE_SERVICE_RELEASE,
+      ]),
     element: <ServiceAdminBoard />,
   },
   {
     name: PAGES.APP_ADMIN_BOARD_DETAIL,
-    role: ROLES.APPROVE_APP_RELEASE || ROLES.DECLINE_APP_RELEASE,
+    allowTo: () =>
+      userHasPortalRole([ROLES.APPROVE_APP_RELEASE, ROLES.DECLINE_APP_RELEASE]),
     isRoute: true,
     element: (
       <Route
@@ -276,7 +289,11 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.SERVICE_ADMIN_BOARD_DETAIL,
-    role: ROLES.APPROVE_SERVICE_RELEASE || ROLES.DECLINE_SERVICE_RELEASE,
+    allowTo: () =>
+      userHasPortalRole([
+        ROLES.APPROVE_SERVICE_RELEASE,
+        ROLES.DECLINE_SERVICE_RELEASE,
+      ]),
     isRoute: true,
     element: (
       <Route
@@ -292,7 +309,7 @@ export const ALL_PAGES: IPage[] = [
   {
     name: PAGES.APP_RELEASE_PROCESS_FORM,
     isRoute: true,
-    role: ROLES.APPOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPOVERVIEW_VIEW),
     element: (
       <Route
         key={`${PAGES.APP_RELEASE_PROCESS}/form`}
@@ -304,7 +321,7 @@ export const ALL_PAGES: IPage[] = [
   {
     name: PAGES.SERVICE_RELEASE_PROCESS_FORM,
     isRoute: true,
-    role: ROLES.VIEW_SERVICE_RELEASE,
+    allowTo: () => userHasPortalRole(ROLES.VIEW_SERVICE_RELEASE),
     element: (
       <Route
         key={`${PAGES.SERVICE_RELEASE_PROCESS}/form`}
@@ -315,12 +332,12 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.USER_MANAGEMENT,
-    role: ROLES.USERMANAGEMENT_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.USERMANAGEMENT_VIEW),
     element: <UserManagement />,
   },
   {
     name: PAGES.USER_DETAILS,
-    role: ROLES.VIEW_USER_ACCOUNT,
+    allowTo: () => userHasPortalRole(ROLES.VIEW_USER_ACCOUNT),
     isRoute: true,
     element: (
       <Route
@@ -334,12 +351,12 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.TECH_USER_MANAGEMENT,
-    role: ROLES.TECH_USER_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.TECH_USER_VIEW),
     element: <TechnicalUserManagement />,
   },
   {
     name: PAGES.TECH_USER_DETAILS,
-    role: ROLES.TECH_USER_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.TECH_USER_VIEW),
     isRoute: true,
     element: (
       <Route
@@ -353,7 +370,7 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.APP_USER_MANAGEMENT,
-    role: ROLES.USERMANAGEMENT_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.USERMANAGEMENT_VIEW),
     isRoute: true,
     element: (
       <Route
@@ -367,17 +384,17 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.IDP_MANAGEMENT,
-    role: ROLES.IDP_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.IDP_VIEW),
     element: <IDPManagement />,
   },
   {
     name: PAGES.INVITE,
-    role: ROLES.INVITE_NEW_PARTNER,
+    allowTo: () => userHasPortalRole(ROLES.INVITE_NEW_PARTNER),
     element: <InviteBusinessPartner />,
   },
   {
     name: PAGES.APPLICATION_REQUESTS,
-    role: ROLES.SUBMITTED_APPLICATION,
+    allowTo: () => userHasPortalRole(ROLES.SUBMITTED_APPLICATION),
     element: <RegistrationRequests />,
   },
   { name: PAGES.CONTACT, element: <Contact /> },
@@ -389,13 +406,13 @@ export const ALL_PAGES: IPage[] = [
   { name: PAGES.ABOUTPAGE, element: <AboutPage /> },
   {
     name: PAGES.CONNECTOR_MANAGEMENT,
-    role: ROLES.CONNECTORS_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.CONNECTORS_VIEW),
     element: <EdcConnector />,
   },
   // The below code which refers to "technicalsetup" page should get removed again with 24.12 since we expect that all users which are using bookmarks have switched to the new page.
   {
     name: PAGES.TECHNICAL_SETUP,
-    role: ROLES.CONNECTORS_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.CONNECTORS_VIEW),
     element: <Redirect path={PAGES.CONNECTOR_MANAGEMENT} />,
   },
   { name: PAGES.LOGOUT, element: <Logout /> },
@@ -504,7 +521,7 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.SERVICE_DETAIL,
-    role: ROLES.SERVICEOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.SERVICEOVERVIEW_VIEW),
     isRoute: true,
     element: (
       <Route
@@ -518,38 +535,38 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.COMPANY_ROLE,
-    role: ROLES.UPDATE_COMPANY_ROLE,
+    allowTo: () => userHasPortalRole(ROLES.UPDATE_COMPANY_ROLE),
     element: <CompanyRoleUpdate />,
   },
   {
     name: PAGES.USECASE_PARTICIPATION,
-    role: ROLES.REQUEST_SSICREDENTIAL,
+    allowTo: () => userHasPortalRole(ROLES.REQUEST_SSICREDENTIAL),
     element: <UsecaseParticipation />,
   },
   {
     name: PAGES.CERTIFICATE_CREDENTIAL,
-    role: ROLES.REQUEST_SSICREDENTIAL,
+    allowTo: () => userHasPortalRole(ROLES.REQUEST_SSICREDENTIAL),
     element: <CertificateCredentials />,
   },
   { name: PAGES.DATA_SPACE, element: <DataSpace /> },
   {
     name: PAGES.ADMIN_CREDENTIAL,
-    role: ROLES.DECISION_SSICREDENTIAL,
+    allowTo: () => userHasSsiCredentialRole(ROLES.DECISION_SSICREDENTIAL),
     element: <AdminCredential />,
   },
   {
     name: PAGES.ONBOARDING_SERVICE_PROVIDER,
-    role: ROLES.IDP_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.IDP_VIEW),
     element: <OSPManagement />,
   },
   {
     name: PAGES.COMPANY_CERTIFICATE,
-    role: ROLES.COMPANY_CERTIFICATE_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.COMPANY_CERTIFICATE_VIEW),
     element: <CompanyCertificates />,
   },
   {
     name: PAGES.COMPANY_WALLET,
-    role: ROLES.CREDENTIAL_REQUESTS,
+    allowTo: () => userHasSsiCredentialRole(ROLES.CREDENTIAL_REQUESTS),
     element: <CompanyWallet />,
   },
   {
@@ -558,12 +575,12 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.COMPANY_SUBSCRIPTIONS,
-    role: ROLES.VIEW_SUBSCRIPTION,
+    allowTo: () => userHasPortalRole(ROLES.VIEW_SUBSCRIPTION),
     element: <CompanySubscriptions />,
   },
   {
     name: PAGES.COMPANY_SUBSCRIPTIONS_DETAIL,
-    role: ROLES.VIEW_SUBSCRIPTION,
+    allowTo: () => userHasPortalRole(ROLES.VIEW_SUBSCRIPTION),
     isRoute: true,
     element: (
       <Route
@@ -577,7 +594,7 @@ export const ALL_PAGES: IPage[] = [
   },
   {
     name: PAGES.COMPANY_DATA,
-    role: ROLES.MY_ORGANIZATION_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.MY_ORGANIZATION_VIEW),
     element: <CompanyData />,
   },
   {
@@ -586,112 +603,112 @@ export const ALL_PAGES: IPage[] = [
   },
 ]
 
-export const ALL_OVERLAYS: IOverlay[] = [
+export const ALL_OVERLAYS: RestrictedItem[] = [
   {
     name: OVERLAYS.ADD_BPN,
-    role: ROLES.MODIFY_USER_ACCOUNT,
+    allowTo: () => userHasPortalRole(ROLES.MODIFY_USER_ACCOUNT),
   },
   {
     name: OVERLAYS.ADD_USER,
-    role: ROLES.USERMANAGEMENT_ADD,
+    allowTo: () => userHasPortalRole(ROLES.USERMANAGEMENT_ADD),
   },
   {
     name: OVERLAYS.ADD_MULTIPLE_USER,
-    role: ROLES.USERMANAGEMENT_ADD,
+    allowTo: () => userHasPortalRole(ROLES.USERMANAGEMENT_ADD),
   },
   {
     name: OVERLAYS.ADD_TECH_USER,
-    role: ROLES.TECH_USER_ADD,
+    allowTo: () => userHasPortalRole(ROLES.TECH_USER_ADD),
   },
   {
     name: OVERLAYS.DELETE_TECH_USER,
-    role: ROLES.TECH_USER_DELETE,
+    allowTo: () => userHasPortalRole(ROLES.TECH_USER_DELETE),
   },
   {
     name: OVERLAYS.ADD_APP_USER_ROLES,
-    role: ROLES.MODIFY_USER_ACCOUNT,
+    allowTo: () => userHasPortalRole(ROLES.MODIFY_USER_ACCOUNT),
   },
   {
     name: OVERLAYS.EDIT_APP_USER_ROLES,
-    role: ROLES.MODIFY_USER_ACCOUNT,
+    allowTo: () => userHasPortalRole(ROLES.MODIFY_USER_ACCOUNT),
   },
-  { name: OVERLAYS.APP, role: ROLES.APPSTORE_VIEW },
+  { name: OVERLAYS.APP, allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW) },
   { name: OVERLAYS.NEWS },
   {
     name: OVERLAYS.PARTNER,
-    role: ROLES.PARTNER_NETWORK_VIEW,
+    allowTo: () => userHasBpdmRole(ROLES.READ_PARTNER),
   },
   {
     name: OVERLAYS.USER,
-    role: ROLES.USERMANAGEMENT_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.USERMANAGEMENT_VIEW),
   },
   {
     name: OVERLAYS.SERVICE_REQUEST,
-    role: ROLES.APPSTORE_VIEW_SERVICES,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW_SERVICES),
   },
   {
     name: OVERLAYS.APPMARKETPLACE_REQUEST,
-    role: ROLES.APPSTORE_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPSTORE_VIEW),
   },
   {
     name: OVERLAYS.IDP_DETAILS,
-    role: ROLES.IDP_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.IDP_VIEW),
   },
   {
     name: OVERLAYS.NOT_FOUND,
-    role: ROLES.IDP_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.IDP_VIEW),
   },
   {
     name: OVERLAYS.IDP_CONFIRM,
-    role: ROLES.IDP_DELETE,
+    allowTo: () => userHasPortalRole(ROLES.IDP_DELETE),
   },
   {
     name: OVERLAYS.ADD_IDP,
-    role: ROLES.IDP_ADD,
+    allowTo: () => userHasPortalRole(ROLES.IDP_ADD),
   },
   {
     name: OVERLAYS.UPDATE_IDP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.UPDATE_IDP_SUCCESS,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.ENABLE_IDP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.DISABLE_IDP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.DISABLE_MANAGED_IDP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.ENABLE_IDP_SUCCESS,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.DELETE_MANAGED_IDP,
-    role: ROLES.IDP_DELETE,
+    allowTo: () => userHasPortalRole(ROLES.IDP_DELETE),
   },
   {
     name: OVERLAYS.ADDUSERS_IDP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.REGISTER_OSP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.REGISTER_NEXT_OSP,
-    role: ROLES.IDP_SETUP,
+    allowTo: () => userHasPortalRole(ROLES.IDP_SETUP),
   },
   {
     name: OVERLAYS.APP_OVERVIEW_CONFIRM,
-    role: ROLES.APPOVERVIEW_VIEW,
+    allowTo: () => userHasPortalRole(ROLES.APPOVERVIEW_VIEW),
   },
   {
     name: OVERLAYS.APP_DETAILS_OVERLAY,
diff --git a/src/types/Constants.ts b/src/types/Constants.ts
index ffe74bcc6..40d9e282f 100644
--- a/src/types/Constants.ts
+++ b/src/types/Constants.ts
@@ -26,8 +26,6 @@ export enum PAGES {
   ROOT = '',
   HOME = 'home',
   REGISTRATION = 'registration',
-  SWAGGER = 'swagger',
-  STORYBOOK = 'storybook',
   APP_SUBSCRIPTION = 'appSubscription',
   APP_ADMIN_BOARD = 'appAdminBoard',
   APP_ADMIN_BOARD_DETAIL = 'appAdminBoardDetail',
@@ -233,6 +231,8 @@ export enum ROLES {
   MY_ACCOUNT = 'view_own_user_account',
   CREDENTIAL_REQUESTS = 'view_credential_requests',
   REVOKE_CREDENTIALS_ISSUER = 'revoke_credentials_issuer',
+  VIEW_REGISTRATION = 'view_registration',
+  READ_PARTNER = 'read_partner',
 }
 
 export enum HINTS {
diff --git a/src/types/MainTypes.ts b/src/types/MainTypes.ts
index d9bd65971..aabd0df2d 100644
--- a/src/types/MainTypes.ts
+++ b/src/types/MainTypes.ts
@@ -91,22 +91,18 @@ export const initialPaginMeta: PaginMeta = {
 
 export const initialPaginResult = { meta: { ...initialPaginMeta }, content: [] }
 
-export type IPage = {
+export type RestrictedItem = {
   name: string
-  role?: string
+  allowTo?: () => boolean
+}
+
+export type IPage = RestrictedItem & {
   element: JSX.Element
   isRoute?: boolean
   children?: string[]
 }
 
-export type IOverlay = {
-  name: string
-  role?: string
-}
-
-export type IAction = {
-  name: string
-  role?: string
+export type IAction = RestrictedItem & {
   element: JSX.Element
   value?: string
 }
diff --git a/src/utils/multiMapBy.test.ts b/src/utils/dataUtils.test.ts
similarity index 78%
rename from src/utils/multiMapBy.test.ts
rename to src/utils/dataUtils.test.ts
index 534c6a2da..019da84ad 100644
--- a/src/utils/multiMapBy.test.ts
+++ b/src/utils/dataUtils.test.ts
@@ -18,8 +18,9 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
-import { multiMapBy } from './multiMapBy'
+import { multiMapBy, intersectAccess } from './dataUtils'
 import { forEach, groupBy, keys, union, uniq, values } from 'lodash'
+import type { KeycloakResourceAccess } from 'keycloak-js'
 
 describe('multiMapBy', () => {
   type person = {
@@ -134,3 +135,48 @@ describe('multiMapBy', () => {
     }
   })
 })
+
+describe('Intersection Tests', () => {
+  const requiredAccess: KeycloakResourceAccess = {
+    client1: { roles: ['read', 'write'] },
+    client2: { roles: ['write'] },
+  }
+
+  const users: Array<KeycloakResourceAccess> = [
+    {
+      client1: { roles: ['read', 'write'] },
+      client2: { roles: ['read', 'write'] },
+      client3: { roles: ['read', 'write'] },
+    },
+    {
+      client1: { roles: ['read'] },
+      client2: { roles: ['read'] },
+    },
+    {
+      client1: { roles: ['read'] },
+    },
+    {
+      client1: { roles: ['create'] },
+      client2: { roles: ['delete'] },
+      client3: { roles: ['read', 'write'] },
+    },
+  ]
+
+  const expected: Array<KeycloakResourceAccess> = [
+    {
+      client1: { roles: ['read', 'write'] },
+      client2: { roles: ['write'] },
+    },
+    {
+      client1: { roles: ['read'] },
+    },
+    { client1: { roles: ['read'] } },
+    {},
+  ]
+
+  it('calculates the intersection of access resource items', () => {
+    users.forEach((user, i) => {
+      expect(intersectAccess(requiredAccess, user)).toEqual(expected[i])
+    })
+  })
+})
diff --git a/src/utils/multiMapBy.ts b/src/utils/dataUtils.ts
similarity index 77%
rename from src/utils/multiMapBy.ts
rename to src/utils/dataUtils.ts
index 0feb79a94..051613ee3 100644
--- a/src/utils/multiMapBy.ts
+++ b/src/utils/dataUtils.ts
@@ -18,6 +18,7 @@
  * SPDX-License-Identifier: Apache-2.0
  ********************************************************************************/
 
+import type { KeycloakResourceAccess } from 'keycloak-js'
 import { forEach, reduce } from 'lodash'
 
 /**
@@ -62,3 +63,23 @@ export const multiMapBy = <T>(
     {}
   )
 }
+
+export const intersect = (
+  arrayA: Array<string>,
+  arrayB: Array<string>
+): string[] => arrayA.filter((item) => arrayB.includes(item))
+
+export const intersectAccess = (
+  requiredAccess: KeycloakResourceAccess,
+  userAccess: KeycloakResourceAccess
+): KeycloakResourceAccess =>
+  Object.keys(requiredAccess)
+    .filter((client) => Object.keys(userAccess).includes(client))
+    .reduce((acc: KeycloakResourceAccess, client: string) => {
+      const roles = intersect(
+        requiredAccess[client].roles,
+        userAccess[client].roles
+      )
+      if (roles.length > 0) acc[client] = { roles }
+      return acc
+    }, {})