diff --git a/infrastructure/shared/docker-compose-combined.yml b/infrastructure/shared/docker-compose-combined.yml
index 63db01d433..ad0e4a9e68 100644
--- a/infrastructure/shared/docker-compose-combined.yml
+++ b/infrastructure/shared/docker-compose-combined.yml
@@ -161,8 +161,8 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED:
-      API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
+      API_KEY_ENABLED: true
+      API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
       issuer-db:
diff --git a/infrastructure/shared/docker-compose-demo.yml b/infrastructure/shared/docker-compose-demo.yml
index 59eec1b988..c35314ba06 100644
--- a/infrastructure/shared/docker-compose-demo.yml
+++ b/infrastructure/shared/docker-compose-demo.yml
@@ -46,7 +46,8 @@ services:
       DEFAULT_WALLET_SEED:
       DEFAULT_WALLET_WEBHOOK_URL:
       DEFAULT_WALLET_AUTH_API_KEY:
-      API_KEY_ENABLED:
+      API_KEY_ENABLED: true
+      API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
       db:
diff --git a/infrastructure/shared/docker-compose-mt-keycloak.yml b/infrastructure/shared/docker-compose-mt-keycloak.yml
index 30a0bf9829..38c6665b22 100644
--- a/infrastructure/shared/docker-compose-mt-keycloak.yml
+++ b/infrastructure/shared/docker-compose-mt-keycloak.yml
@@ -104,8 +104,8 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED:
-      API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
+      API_KEY_ENABLED: false
+      API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
       KEYCLOAK_ENABLED: true
       KEYCLOAK_URL: http://keycloak:8080
diff --git a/infrastructure/shared/docker-compose-with-kafka.yml b/infrastructure/shared/docker-compose-with-kafka.yml
index 2d8bccd8cb..cfb3dfc5db 100644
--- a/infrastructure/shared/docker-compose-with-kafka.yml
+++ b/infrastructure/shared/docker-compose-with-kafka.yml
@@ -107,8 +107,8 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED:
-      API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
+      API_KEY_ENABLED: true
+      API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
       db:
diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml
index 836dbd4c84..9bb62e5786 100644
--- a/infrastructure/shared/docker-compose.yml
+++ b/infrastructure/shared/docker-compose.yml
@@ -107,8 +107,8 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED:
-      API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
+      API_KEY_ENABLED: true
+      API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
       db:
diff --git a/tests/integration-tests/src/test/resources/containers/agent.yml b/tests/integration-tests/src/test/resources/containers/agent.yml
index 7405ce6b8f..f2363cd58c 100644
--- a/tests/integration-tests/src/test/resources/containers/agent.yml
+++ b/tests/integration-tests/src/test/resources/containers/agent.yml
@@ -24,6 +24,8 @@ services:
   identus-cloud-agent:
     image: ghcr.io/hyperledger/identus-cloud-agent:${AGENT_VERSION}
     environment:
+      API_KEY_ENABLED: true
+      API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       PRISM_NODE_HOST: host.docker.internal
       PRISM_NODE_PORT:
       CASTOR_DB_HOST: postgres
@@ -41,7 +43,6 @@ services:
       DIDCOMM_SERVICE_URL:
       REST_SERVICE_URL:
       POLLUX_STATUS_LIST_REGISTRY_PUBLIC_URL:
-      API_KEY_ENABLED:
       STATUS_LIST_SYNC_TRIGGER_RECURRENCE_DELAY: 5 seconds
       DID_STATE_SYNC_TRIGGER_RECURRENCE_DELAY: 5 seconds
       # Secret storage configuration