diff --git a/docker-compose-keycloak-firstrun.yml b/docker-compose-keycloak-firstrun.yml
index 80efe9f20e330af1e28dec380c406520ce822945..8e1766bf000b1ac06624c3d6493ba730c01f7fd1 100644
--- a/docker-compose-keycloak-firstrun.yml
+++ b/docker-compose-keycloak-firstrun.yml
@@ -9,8 +9,6 @@ services:
   # Import LINCS realm
   keycloak-firstrun:
     image: adorsys/keycloak-config-cli:latest
-    env_file: 
-      - "../leafwriter.env"
     environment:
       - KEYCLOAK_URL=http://keycloak:8080/
       - KEYCLOAK_USER=tempadmin
@@ -19,6 +17,8 @@ services:
       - KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s
       - IMPORT_FILES_LOCATIONS=/config/leafwriter-conf.json
       - IMPORT_VARSUBSTITUTION_ENABLED=true
+      - admin_cli_secret=${admin_cli_secret}
+      - leafwriter_domain=${leafwriter_domain}
     volumes:
       - ./keycloak-provisioning-files:/config
     depends_on:
@@ -29,8 +29,6 @@ services:
   # Second run of Keycloak-config-cli Tool to automatically create permanent Keycloak admin, used for gui login as well as auth-api
   keycloak-secondrun:
     image: adorsys/keycloak-config-cli:latest
-    env_file: 
-      - "../leafwriter.env"
     environment:
       - KEYCLOAK_URL=http://keycloak:8080/
       - KEYCLOAK_USER=tempadmin
@@ -39,6 +37,8 @@ services:
       - KEYCLOAK_AVAILABILITYCHECK_TIMEOUT=120s
       - IMPORT_FILES_LOCATIONS=/config/leafwriter-conf-master.json
       - IMPORT_VARSUBSTITUTION_ENABLED=true
+      - keycloak_admin=${keycloak_admin}
+      - keycloak_password=${keycloak_password}
     volumes:
       - ./keycloak-provisioning-files:/config
     depends_on:
@@ -52,8 +52,6 @@ services:
   # Third run to disable Keycloak temporary admin, otherwise Keycloak is complaining, but Keycloak can not get it right an accept an expiration time for its temporary admin, which the dumb issue where they introduced the behavior promised to have …
   keycloak-thirdrun:
     image: adorsys/keycloak-config-cli:latest
-    env_file: 
-      - "../leafwriter.env"
     environment:
       - KEYCLOAK_URL=http://keycloak:8080/
       - KEYCLOAK_USER=${keycloak_admin}