diff --git a/jenkins.sh b/jenkins.sh
index 414ac07..c0653fa 100755
--- a/jenkins.sh
+++ b/jenkins.sh
@@ -29,7 +29,16 @@
 
 # if `docker run` first argument start with `--` the user is passing jenkins launcher arguments
 if [[ $# -lt 1 ]] || [[ "$1" == "--"* ]]; then
-   exec java $JAVA_OPTS -jar /usr/share/jenkins/jenkins.war $JENKINS_OPTS "$@"
+  CMD=(java)
+  if [ ! -z "$JAVA_OPTS" ]; then
+    CMD+=("$JAVA_OPTS")
+  fi
+  CMD+=(-jar)
+  CMD+=(/usr/share/jenkins/jenkins.war)
+  if [ ! -z "$JENKINS_OPTS" ]; then
+    CMD+=("$JENKINS_OPTS")
+  fi
+  exec "${CMD[@]}" "$@"
 fi
 
 # As argument is not jenkins, assume user want to run his own process, for sample a `bash` shell to explore this image