diff --git a/Dockerfile b/Dockerfile
index 6a39162..42cf3e1 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -21,4 +21,5 @@ USER ngrok
 
 EXPOSE 4040
 
-CMD ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["/bin/ngrok"]
diff --git a/entrypoint.sh b/entrypoint.sh
index 67b3fc0..43a2f3d 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/sh -e
 
 if [ "$1" = "/bin/sh" ]; then
   shift
@@ -55,4 +55,4 @@ case "$1" in
   *)        ARGS="$PROTOCOL $ARGS -log stdout $* $FWD" ;;
 esac
 
-exec /bin/ngrok $ARGS
+exec "$@"