diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh
index 587cf3d..6463067 100644
--- a/docker/entrypoint.sh
+++ b/docker/entrypoint.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+declare -a args
+
 # Allows to attach to a shell inside the container, or run ansbile commands,
 # otherwise run the 'hpa' script with the given arguments.
 #
@@ -16,7 +18,10 @@ while [[ $# -gt 0 ]]; do
 		exec "$@"
 		exit $?
 	else
-		/usr/local/bin/hpa "$@"
+		args+=("$1")
 	fi
 	shift
 done
+
+# If we made it here then run the hpa script.
+/usr/local/bin/hpa "${args[@]}"