diff --git a/Dockerfile b/Dockerfile
index 11050e39776b16c4dd42b5924c012fbfd3388e16..85f1a7addc00d46dd7a554d0940d94adee0dc249 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -31,4 +31,4 @@ VOLUME ["/srv/socket", "/srv/logs", "/var/audio/source", "/var/audio/playlist"]
 
 # Start the Engine
 EXPOSE 1337/tcp
-ENTRYPOINT ["./run.sh"]
+ENTRYPOINT ["./run.sh", "prod"]
diff --git a/config/supervisor/aura-engine.conf b/config/supervisor/aura-engine.conf
index df4e33c683b5355f80bf08697e1656a473f90f4c..bada2f8d90c3728d004f0459921a979d96c6e2c4 100644
--- a/config/supervisor/aura-engine.conf
+++ b/config/supervisor/aura-engine.conf
@@ -1,7 +1,7 @@
 [program:aura-engine]
 user = engineuser
 directory = /opt/aura/engine
-command = /opt/aura/engine/run.sh engine
+command = /opt/aura/engine/run.sh prod
 
 priority = 666
 autostart = true
diff --git a/config/systemd/aura-engine.service b/config/systemd/aura-engine.service
index 004b652a49ba8b7a3a2b8e3d95c0ba4a86d05e22..02076fceac47108ea6eed23770a6592b9156c2ac 100644
--- a/config/systemd/aura-engine.service
+++ b/config/systemd/aura-engine.service
@@ -8,7 +8,7 @@ Requires=aura-engine-core.service
 Type=simple
 User=engineuser
 WorkingDirectory=/opt/aura/engine
-ExecStart=/opt/aura/engine/run.sh
+ExecStart=/opt/aura/engine/run.sh prod
 Restart=always
 
 [Install]
diff --git a/run.sh b/run.sh
index 2bd3e6f5d1c7602056d833b7913b7e0e9b275fe1..39980cd87551b12deab235e84e37610f215dc0e0 100755
--- a/run.sh
+++ b/run.sh
@@ -8,16 +8,16 @@ docker="false"
 # Call with one of these parameters:
 #
 # - dev
-# - engine
+# - prod
 # - test
 # - recreate-database
 
-# - docker:engine
+# - docker:dev
 # - docker:build
 # - docker:push
 #
 
-if [[ $* =~ ^(dev|engine|test|recreate-database)$ ]]; then
+if [[ $* =~ ^(dev|prod|test|recreate-database)$ ]]; then
 	mode=$1
 fi
 
@@ -50,7 +50,7 @@ if [[ $docker == "false" ]]; then
 
 	### Runs Engine ###
 
-	if [[ $mode == "engine" ]]; then
+	if [[ $mode == "prod" ]]; then
 		/usr/bin/env $PYTHON_EXEC run.py
 	fi
 
@@ -79,7 +79,7 @@ if [[ $docker == "true" ]]; then
 
 	### Runs Engine Docker Container ###
 
-	if [[ $mode == "engine" ]]; then
+	if [[ $mode == "dev" ]]; then
 
 		if [[ -z "${AURA_ENGINE_CONFIG_PATH}" ]]; then
 			AURA_ENGINE_CONFIG_PATH=$(readlink -f "${BASE_DIR}/config/engine.docker.ini")