diff --git a/infrastructure/shared/docker-compose-combined.yml b/infrastructure/shared/docker-compose-combined.yml
index ad0e4a9e68..bfa8a786b4 100644
--- a/infrastructure/shared/docker-compose-combined.yml
+++ b/infrastructure/shared/docker-compose-combined.yml
@@ -161,7 +161,7 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED: true
+      API_KEY_ENABLED: ${ISSUER_API_KEY_ENABLED:-true}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
@@ -235,7 +235,7 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED:
+      API_KEY_ENABLED: ${HOLDER_API_KEY_ENABLED:-true}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
       API_KEY_AUTO_PROVISIONING:
     depends_on:
@@ -309,7 +309,7 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED:
+      API_KEY_ENABLED: ${VERIFIER_API_KEY_ENABLED:-true}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER:
       API_KEY_AUTO_PROVISIONING:
     depends_on:
diff --git a/infrastructure/shared/docker-compose-demo.yml b/infrastructure/shared/docker-compose-demo.yml
index c35314ba06..a76d09b71e 100644
--- a/infrastructure/shared/docker-compose-demo.yml
+++ b/infrastructure/shared/docker-compose-demo.yml
@@ -46,7 +46,7 @@ services:
       DEFAULT_WALLET_SEED:
       DEFAULT_WALLET_WEBHOOK_URL:
       DEFAULT_WALLET_AUTH_API_KEY:
-      API_KEY_ENABLED: true
+      API_KEY_ENABLED: ${API_KEY_ENABLED:-true}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
diff --git a/infrastructure/shared/docker-compose-mt-keycloak.yml b/infrastructure/shared/docker-compose-mt-keycloak.yml
index 38c6665b22..b4c8a3d06e 100644
--- a/infrastructure/shared/docker-compose-mt-keycloak.yml
+++ b/infrastructure/shared/docker-compose-mt-keycloak.yml
@@ -104,7 +104,7 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED: false
+      API_KEY_ENABLED: ${API_KEY_ENABLED:-false}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
       KEYCLOAK_ENABLED: true
diff --git a/infrastructure/shared/docker-compose-with-kafka.yml b/infrastructure/shared/docker-compose-with-kafka.yml
index cfb3dfc5db..a0db6d80f6 100644
--- a/infrastructure/shared/docker-compose-with-kafka.yml
+++ b/infrastructure/shared/docker-compose-with-kafka.yml
@@ -107,7 +107,7 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED: true
+      API_KEY_ENABLED: ${API_KEY_ENABLED:-true}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on:
diff --git a/infrastructure/shared/docker-compose.yml b/infrastructure/shared/docker-compose.yml
index 9bb62e5786..bd81eec31b 100644
--- a/infrastructure/shared/docker-compose.yml
+++ b/infrastructure/shared/docker-compose.yml
@@ -107,7 +107,7 @@ services:
       WEBHOOK_PARALLELISM:
       ADMIN_TOKEN:
       API_KEY_SALT:
-      API_KEY_ENABLED: true
+      API_KEY_ENABLED: ${API_KEY_ENABLED:-true}
       API_KEY_AUTHENTICATE_AS_DEFAULT_USER: false
       API_KEY_AUTO_PROVISIONING:
     depends_on: