diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index 3f3393b1..c4fa71fc 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -36,7 +36,7 @@ VOLUME ["/plugins"]
 COPY server.properties /tmp/server.properties
 WORKDIR /data
 
-CMD [ "/start" ]
+ENTRYPOINT [ "/start" ]
 
 # Special marker ENV used by MCCY management tool
 ENV MC_IMAGE=YES
diff --git a/minecraft-server/get-mcadmin-versions.sh b/minecraft-server/get-mcadmin-versions.sh
index f4ca7ba4..0f2b7ba3 100755
--- a/minecraft-server/get-mcadmin-versions.sh
+++ b/minecraft-server/get-mcadmin-versions.sh
@@ -6,8 +6,8 @@ if [ $# -lt 1 ]; then
 fi
 
 cd /tmp
-wget -O mcadmin-versions.jar https://bintray.com/itzgeoff/artifacts/download_file?file_path=me%2Fitzg%2Fmcadmin-versions%2F1.1.0%2Fmcadmin-versions-1.1.0.jar
-wget http://central.maven.org/maven2/org/jsoup/jsoup/1.9.1/jsoup-1.9.1.jar
+wget -qO mcadmin-versions.jar https://bintray.com/itzgeoff/artifacts/download_file?file_path=me%2Fitzg%2Fmcadmin-versions%2F1.1.0%2Fmcadmin-versions-1.1.0.jar
+wget -q http://central.maven.org/maven2/org/jsoup/jsoup/1.9.1/jsoup-1.9.1.jar
 
 java -jar mcadmin-versions.jar $1 > /tmp/mcadmin-versions.db
 rm *.jar
diff --git a/minecraft-server/start-minecraft.sh b/minecraft-server/start-minecraft.sh
index d9d65ff2..5563dff7 100755
--- a/minecraft-server/start-minecraft.sh
+++ b/minecraft-server/start-minecraft.sh
@@ -398,9 +398,9 @@ fi
 # If we have a bootstrap.txt file... feed that in to the server stdin
 if [ -f /data/bootstrap.txt ];
 then
-    exec java $JVM_OPTS -jar $SERVER < /data/bootstrap.txt
+    exec java $JVM_OPTS -jar $SERVER $* < /data/bootstrap.txt
 else
-    exec java $JVM_OPTS -jar $SERVER
+    exec java $JVM_OPTS -jar $SERVER $*
 fi
 
 exec java $JVM_OPTS -jar $SERVER
diff --git a/minecraft-server/start.sh b/minecraft-server/start.sh
index 98e26066..ffaeb82b 100755
--- a/minecraft-server/start.sh
+++ b/minecraft-server/start.sh
@@ -16,4 +16,4 @@ mkdir -p /home/minecraft
 chown minecraft: /home/minecraft
 
 echo "Switching to user 'minecraft'"
-exec sudo -E -u minecraft /start-minecraft
+exec sudo -E -u minecraft /start-minecraft $*