diff --git a/run.sh b/run.sh
index 31f3d3c24885e91c1d54268d9254841755745e2f..29fa5251cd47057925d75f0a15c44d212f2cc044 100755
--- a/run.sh
+++ b/run.sh
@@ -2,18 +2,39 @@
 mode="engine"
 docker="false"
 
+#
+# Run Script for AURA Engine
+#
+# Call with one of these parameters:
+#
+# - engine
+# - core
+# - lqs
+# - api-dev
+# - api
+#
+# - docker:engine
+# - docker:core
+# - docker:lqs
+# - docker:build
+# - docker:api
+#
+
 if [[ $* =~ ^(engine|core|lqs|api-dev|api)$ ]]; then 
 	mode=$1 
 fi
 
-if [[ $* =~ ^(docker)$ ]]; then 
+if [[ "$1" == *"docker:"* ]]; then
 	docker="true"
+	mode=${1#*:}
 fi
 
+
 echo "[ Run mode=$mode ]"
 echo "[ Docker=$docker ]"
 
 
+
 # +++ DEFAULT COMMANDS +++ #
 
 if [[ $docker == "false" ]]; then
@@ -115,4 +136,11 @@ if [[ $docker == "true" ]]; then
 			--device aura/engine /bin/bash \
 			-c "gunicorn -c configuration/gunicorn.conf.py engine-api:app"
 	fi
+
+	### Create Docker Image from local project ###
+
+	if [[ $mode == "build" ]]; then
+		exec sudo docker build -t aura/engine .
+	fi
+
 fi
\ No newline at end of file