diff --git a/Makefile b/Makefile
index d69619041e3c395cf948c71c6e69024bf39a0e05..80d177745d4451424a80857263f5c7c81ce2a076 100644
--- a/Makefile
+++ b/Makefile
@@ -17,18 +17,6 @@ help::
 
 # Settings
 
-STEERING_BASE_URL := http://0.0.0.0:8000/
-ENGINE_API_BASE_URL := http://0.0.0.0:8008/
-TANK_BASE_URL := http://0.0.0.0:8040/
-ENGINE_TANK_SESSION := engine
-ENGINE_TANK_SECRET := rather-secret
-
-# ENGINE_DB_HOST := 172.17.0.1
-ENGINE_DB_HOST := 0.0.0.0
-ENGINE_DB_NAME := aura_engine
-ENGINE_DB_USER := aura_engine
-ENGINE_DB_PASS := 1234
-
 AURA_ENGINE_CORE_SOCKET := "aura_engine_socket"
 AURA_ENGINE_CONFIG := ${CURDIR}/config/engine.docker.ini
 AURA_AUDIO_STORE_SOURCE := ${CURDIR}/../engine-core/audio/source
@@ -40,18 +28,7 @@ DOCKER_RUN = @docker run \
 		--name $(APP_NAME) \
 		--network="host" \
 		--mount type=tmpfs,destination=/tmp \
-		--device /dev/snd \
-		--group-add audio \
-		-e TZ=$(TIMEZONE) \
-		-e STEERING_BASE_URL=$(STEERING_BASE_URL) \
-		-e ENGINE_API_BASE_URL=$(ENGINE_API_BASE_URL) \
-		-e TANK_BASE_URL=$(TANK_BASE_URL) \
-		-e ENGINE_TANK_SESSION=$(ENGINE_TANK_SESSION) \
-		-e ENGINE_TANK_SECRET=$(ENGINE_TANK_SECRET) \
-		-e ENGINE_DB_HOST=$(ENGINE_DB_HOST) \
-		-e ENGINE_DB_NAME=$(ENGINE_DB_NAME) \
-		-e ENGINE_DB_USER=$(ENGINE_DB_USER) \
-		-e ENGINE_DB_PASS=$(ENGINE_DB_PASS) \
+		--env-file docker.env \
 		-v aura_engine_socket:"/srv/socket" \
 		-v "$(AURA_ENGINE_CONFIG)":"/etc/aura/engine.ini":ro \
 		-v "$(AURA_AUDIO_STORE_SOURCE)":"/var/audio/source":ro \
diff --git a/sample.docker.env b/sample.docker.env
new file mode 100644
index 0000000000000000000000000000000000000000..37354ac047a81a6e57360a1ee4553f09577deb6a
--- /dev/null
+++ b/sample.docker.env
@@ -0,0 +1,20 @@
+TZ=Europe/Vienna
+
+# Engine
+AURA_ENGINE_FALLBACK_SHOW_NAME=Random Music
+AURA_ENGINE_FALLBACK_SHOW_ID=-1
+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
+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
+