diff --git a/config/sample.engine.docker.ini b/config/sample.engine.docker.ini
index c9536654eeda434454ea55c0cd09bd39d17807d4..74f6bec3027d04c3ef8be3ea56d76e89943a16db 100644
--- a/config/sample.engine.docker.ini
+++ b/config/sample.engine.docker.ini
@@ -8,7 +8,7 @@ socket_dir="/srv/socket"
 # Directory where the log file resides
 log_dir="logs"
 # Possible values: debug, info, warning, error, critical
-log_level="info"
+log_level="${AURA_ENGINE_LOG_LEVEL}"
 # Details for the Station Fallback
 fallback_show_name="${AURA_ENGINE_FALLBACK_SHOW_NAME}"
 fallback_show_id="${AURA_ENGINE_FALLBACK_SHOW_ID}"
@@ -33,11 +33,11 @@ from_mail="monitoring@aura.radio"
 mailsubject_prefix="[AURA Engine]" # default: [AURA Engine]
 
 # Seconds how often the vitality of Engine Core should be checked (default=1)
-heartbeat_frequency=1
+heartbeat_frequency="${AURA_ENGINE_HEARTBEAT_FREQUENCY}"
 # Host where heartbeat is sent to (disabled if empty string)
-heartbeat_server=""
+heartbeat_server="${AURA_ENGINE_HEARTBEAT_SERVER}"
 # Some UDP port
-heartbeat_port=43334
+heartbeat_port="${AURA_ENGINE_HEARTBEAT_SERVER_PORT}"
 
 [api]
 ## STEERING ##
@@ -100,6 +100,6 @@ preload_offset=15
 input_stream_retry_delay=1
 input_stream_max_retries=10
 input_stream_buffer=3.0
-# How long we have to fade in and out, when we select another mixer input (seconds))
-fade_in_time="1.5"
-fade_out_time="1.5"
+# Fade duration when selecting another mixer input (seconds)
+fade_in_time="${AURA_ENGINE_FADE_IN_TIME}"
+fade_out_time="${AURA_ENGINE_FADE_OUT_TIME}"
diff --git a/sample.docker.env b/sample.docker.env
index 37354ac047a81a6e57360a1ee4553f09577deb6a..722f2e9932d83b9b29896d834cbe65302f365b8e 100644
--- a/sample.docker.env
+++ b/sample.docker.env
@@ -1,20 +1,34 @@
 TZ=Europe/Vienna
 
-# Engine
-AURA_ENGINE_FALLBACK_SHOW_NAME=Random Music
-AURA_ENGINE_FALLBACK_SHOW_ID=-1
+# Possible values: debug, info, warning, error, critical
+AURA_ENGINE_LOG_LEVEL=info
+
+# Database for caching scheduling data
 AURA_ENGINE_DB_HOST=172.17.0.1
 AURA_ENGINE_DB_NAME=aura_engine
 AURA_ENGINE_DB_USER=aura_engine
 AURA_ENGINE_DB_PASS=1234
-AURA_ENGINE_LATENCY_OFFSET=0.5
-AURA_ENGINE_API_BASE_URL=http://172.17.0.1:8008/
 
-# Steering
+# API
+AURA_ENGINE_API_BASE_URL=http://172.17.0.1:8008/
 AURA_STEERING_BASE_URL=http://172.17.0.1:8000/
-
-# Tank
 AURA_TANK_BASE_URL=http://172.17.0.1:8040/
 AURA_TANK_ENGINE_USER=engine
 AURA_TANK_ENGINE_PASSWORD=rather-secret
 
+# Details for the Station Fallback i.e. the default show when nothing is scheduled
+AURA_ENGINE_FALLBACK_SHOW_NAME=Random Music
+AURA_ENGINE_FALLBACK_SHOW_ID=-1
+
+# Offset in seconds how long it takes for Liquidsoap to actually execute a scheduler command; Crucial to keep things in sync
+AURA_ENGINE_LATENCY_OFFSET=0.5
+
+# Fade duration when selecting another mixer input (seconds)
+AURA_ENGINE_FADE_IN_TIME=1.5
+AURA_ENGINE_FADE_OUT_TIME=1.5
+
+# Host and UDP port where heartbeat is sent to (disabled if empty string)
+# Seconds how often the vitality of Engine Core should be checked (default=1)
+AURA_ENGINE_HEARTBEAT_SERVER=
+AURA_ENGINE_HEARTBEAT_SERVER_PORT=43334
+AURA_ENGINE_HEARTBEAT_FREQUENCY=1