diff --git a/entrypoint.sh b/entrypoint.sh
index f509203d4..fa798f642 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -7,15 +7,13 @@ function cleanup()
     fi
 }
 
-service="all"
-if [[ "$1" != "" ]];then
-    service=$1
-fi
+action="${1-start}"
+service="${2-all}"
 
 trap cleanup EXIT
-if [[ "$1" == "bash" ]];then
+if [[ "$action" == "bash" || "$action" == "sh" ]];then
     bash
 else
-    python jms start ${service}
+    python jms "${action}" "${service}"
 fi