diff --git a/indexer-acceptance-test/docs/README.md b/indexer-acceptance-test/docs/README.md
index 10181e6c3913de14888b1f39a33cb3afbaa5658d..98a23e0859ed5e885f7c3b32e32487b6b2ba5476 100644
--- a/indexer-acceptance-test/docs/README.md
+++ b/indexer-acceptance-test/docs/README.md
@@ -18,14 +18,14 @@ You will need to have the following environment variables defined.
 
 Authentication can be provided as OIDC config:
 
-| name                                 | value                                   | description             | sensitive? | source |
-|--------------------------------------|-----------------------------------------|-------------------------|------------|--------|
-| `TEST_OPENID_PROVIDER_CLIENT_ID`     | `********`                              | ROOT_USER Client Id     | yes        | -      |
-| `TEST_OPENID_PROVIDER_CLIENT_SECRET` | `********`                              | ROOT_USER Client Secret | yes        | -      |
-| `TEST_OPENID_PROVIDER_URL`           | `https://keycloak.com/auth/realms/osdu` | OpenID Provider Url     | yes        | -      |
-| `ELASTIC_USER_NAME`                  | `********`                              | Elastic User            | ?          | -      |
-| `ELASTIC_PASSWORD`                   | `********`                              | Elastic User Password   | yes        | -      |
-| `ELASTIC_PORT`                       | `********`                              | Elastic Request Port    | ?          | -      |
+| name                                            | value                                   | description             | sensitive? | source |
+|-------------------------------------------------|-----------------------------------------|-------------------------|------------|--------|
+| `PRIVILEGED_USER_OPENID_PROVIDER_CLIENT_ID`     | `********`                              | ROOT_USER Client Id     | yes        | -      |
+| `PRIVILEGED_USER_OPENID_PROVIDER_CLIENT_SECRET` | `********`                              | ROOT_USER Client Secret | yes        | -      |
+| `TEST_OPENID_PROVIDER_URL`                      | `https://keycloak.com/auth/realms/osdu` | OpenID Provider Url     | yes        | -      |
+| `ELASTIC_USER_NAME`                             | `********`                              | Elastic User            | ?          | -      |
+| `ELASTIC_PASSWORD`                              | `********`                              | Elastic User Password   | yes        | -      |
+| `ELASTIC_PORT`                                  | `********`                              | Elastic Request Port    | ?          | -      |
 Or tokens can be used directly from env variables:
 
 | name              | value      | description           | sensitive? | source |
@@ -34,15 +34,17 @@ Or tokens can be used directly from env variables:
 
 #### Entitlements configuration for Integration Accounts
 
-| ROOT_USER                           |
-|-------------------------------------|
-| users                               |
-| service.schema-service.system-admin |
-| service.entitlements.user           |
-| service.schema-service.viewers      |
-| service.schema-service.editors      |
-| data.integration.test               |
-| data.test1                          |
+| INTEGRATION_TESTER            | NO_DATA_ACCESS_TESTER |
+|-------------------------------|-----------------------|
+| users                         |                       |
+| users.datalake.ops            |                       |
+| service.storage.creator       |                       |
+| service.entitlements.user     |                       |
+| service.search.user           |                       |
+| service.search.admin          |                       |
+| data.test1                    |                       |
+| data.integration.test         |                       |
+| users@{tenant1}@{groupId}.com |                       |
 
 Execute following command to build code and run all the integration tests:
 
diff --git a/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java b/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
index 44e991e1ffe43c8da7c0033f3099714fb6506cbc..171a1d503758429550a1710e53504e9995822163 100644
--- a/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
+++ b/indexer-acceptance-test/src/test/java/org/opengroup/osdu/util/conf/OpenIDProviderConfig.java
@@ -34,9 +34,9 @@ public class OpenIDProviderConfig {
 
     public static OpenIDProviderConfig Instance() {
         try {
-            openIDProviderConfig.clientId = System.getProperty("TEST_OPENID_PROVIDER_CLIENT_ID", System.getenv("TEST_OPENID_PROVIDER_CLIENT_ID"));
+            openIDProviderConfig.clientId = System.getProperty("PRIVILEGED_USER_OPENID_PROVIDER_CLIENT_ID", System.getenv("PRIVILEGED_USER_OPENID_PROVIDER_CLIENT_ID"));
             openIDProviderConfig.url = System.getProperty("TEST_OPENID_PROVIDER_URL", System.getenv("TEST_OPENID_PROVIDER_URL"));
-            openIDProviderConfig.clientSecret = System.getProperty("TEST_OPENID_PROVIDER_CLIENT_SECRET", System.getenv("TEST_OPENID_PROVIDER_CLIENT_SECRET"));
+            openIDProviderConfig.clientSecret = System.getProperty("PRIVILEGED_USER_OPENID_PROVIDER_CLIENT_SECRET", System.getenv("PRIVILEGED_USER_OPENID_PROVIDER_CLIENT_SECRET"));
             Issuer issuer = new Issuer(openIDProviderConfig.url);
             OIDCProviderConfigurationRequest request = new OIDCProviderConfigurationRequest(issuer);
             HTTPRequest httpRequest = request.toHTTPRequest();