diff --git a/minecraft-server/Dockerfile b/minecraft-server/Dockerfile
index 1ad07ab6..3a5ba57a 100644
--- a/minecraft-server/Dockerfile
+++ b/minecraft-server/Dockerfile
@@ -1,4 +1,4 @@
-FROM itzg/ubuntu-openjdk-7
+FROM java:8
 
 MAINTAINER itzg
 
@@ -19,7 +19,6 @@ RUN useradd -M -s /bin/false --uid 1000 minecraft \
 
 EXPOSE 25565
 
-COPY start.sh /start
 COPY start-minecraft.sh /start-minecraft
 
 VOLUME ["/data"]
@@ -29,7 +28,8 @@ VOLUME ["/plugins"]
 COPY server.properties /tmp/server.properties
 WORKDIR /data
 
-CMD [ "/start" ]
+USER minecraft
+CMD [ "/start-minecraft" ]
 
 # Special marker ENV used by MCCY management tool
 ENV MC_IMAGE=YES
diff --git a/minecraft-server/start.sh b/minecraft-server/start.sh
deleted file mode 100755
index 5f91e8fb..00000000
--- a/minecraft-server/start.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-set -e
-usermod --uid $UID minecraft
-groupmod --gid $GID minecraft
-
-chown -R minecraft:minecraft /data /start-minecraft
-chmod -R g+wX /data /start-minecraft
-
-while lsof -- /start-minecraft; do
-  echo -n "."
-  sleep 1
-done
-echo "...switching to user 'minecraft'"
-exec sudo -E -u minecraft /start-minecraft