diff --git a/ccp/modules/teiler-compose.yml b/ccp/modules/teiler-compose.yml
index b6fc4c6..759b066 100644
--- a/ccp/modules/teiler-compose.yml
+++ b/ccp/modules/teiler-compose.yml
@@ -42,8 +42,6 @@ services:
       EXPORTER_API_KEY: "${EXPORTER_API_KEY}"
       TEILER_ORCHESTRATOR_URL: "/ccp-teiler"
       TEILER_ORCHESTRATOR_HTTP_RELATIVE_PATH: "/ccp-teiler"
-      TEILER_USER: "${OIDC_USER_GROUP}"
-      TEILER_ADMIN: "${OIDC_ADMIN_GROUP}"
       REPORTER_DEFAULT_TEMPLATE_ID: "ccp-qb"
       EXPORTER_DEFAULT_TEMPLATE_ID: "ccp"
 
@@ -70,3 +68,7 @@ services:
       ENABLE_MTBA: "${ENABLE_MTBA}"
       ENABLE_DATASHIELD: "${ENABLE_DATASHIELD}"
       IDMANAGER_UPLOAD_APIKEY: "${IDMANAGER_UPLOAD_APIKEY}" # Only used to check if the ID Manager is active
+      TEILER_ROLE_USER: "${OIDC_USER_GROUP}"
+      TEILER_ROLE_ADMIN: "${OIDC_ADMIN_GROUP}"
+      TEILER_ROLE_PSP: "${OIDC_PSP_GROUP}"
+