diff --git a/compose.yml b/compose.yml
index 2f5f51b..1cca170 100644
--- a/compose.yml
+++ b/compose.yml
@@ -171,11 +171,16 @@ services:
     env_file:
       - .env
     environment:
+      BOOKLOGR_DEFAULT_PASSWORD: "${BOOKLOGR_DEFAULT_PASSWORD}"
+      BOOKLOGR_DEFAULT_USER: "${BOOKLOGR_DEFAULT_USER}"
       DATABASE_URL: "sqlite:///books.db"
       AUTH_ALLOW_REGISTRATION: False
       AUTH_REQUIRE_VERIFICATION: False
       SINGLE_USER_MODE: True
       AUTH_SECRET_KEY: "${BOOKLOGR_AUTH_SECRET_KEY}"
+      BL_API_ENDPOINT: "http://books-api.tomasrivera.ch" # CHANGE THIS TO POINT TO THE EXTERNAL ADRESS THE USER CAN ACCESS
+      BL_GOOGLE_ID: "" # Leave empty to disable google login. To enable, write in your Google Client ID.
+      BL_DEMO_MODE: False
     volumes:
       - /opt/server/booklogr/api:/app/instance
 
@@ -185,8 +190,16 @@ services:
     env_file:
       - .env
     environment:
-      - BL_API_ENDPOINT=http://books-api.tomasrivera.ch # CHANGE THIS TO POINT TO THE EXTERNAL ADRESS THE USER CAN ACCESS
-      - BL_GOOGLE_ID= # Leave empty to disable google login. To enable, write in your Google Client ID.
-      - BL_DEMO_MODE=false
+      BOOKLOGR_DEFAULT_PASSWORD: "${BOOKLOGR_DEFAULT_PASSWORD}"
+      BOOKLOGR_DEFAULT_USER: "${BOOKLOGR_DEFAULT_USER}"
+      DATABASE_URL: "sqlite:///books.db"
+      AUTH_ALLOW_REGISTRATION: False
+      AUTH_REQUIRE_VERIFICATION: False
+      SINGLE_USER_MODE: True
+      AUTH_SECRET_KEY: "${BOOKLOGR_AUTH_SECRET_KEY}"
+      BL_API_ENDPOINT: "http://books-api.tomasrivera.ch" # CHANGE THIS TO POINT TO THE EXTERNAL ADRESS THE USER CAN ACCESS
+      BL_GOOGLE_ID: "" # Leave empty to disable google login. To enable, write in your Google Client ID.
+      BL_DEMO_MODE: False
+
     depends_on:
       - booklogr-api