diff --git a/docker-compose.yaml b/docker-compose.yaml
index c9ce518..3378f22 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -56,9 +56,7 @@ services:
       GF_AUTH_GENERIC_OAUTH_NAME: "VEDA Keycloak"
       GF_AUTH_GENERIC_OAUTH_SCOPES: "openid profile email"
       # Role Mapping
-      # - GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_STRICT: "true" if require_matching_scope else "false",
-      GF_AUTH_GENERIC_OAUTH_ROLE_ATTRIBUTE_PATH: role_attribute_path_expression
-      GF_AUTH_GENERIC_OAUTH_ALLOW_ASSIGN_GRAFANA_ADMIN: "true"
+      GF_AUTH_GENERIC_OAUTH_AUTO_ASSIGN_ORG_ROLE: Admin
       # Auth server details
       GF_AUTH_GENERIC_OAUTH_CLIENT_ID: grafana
       GF_AUTH_GENERIC_OAUTH_CLIENT_SECRET: mock_grafana_client_secret