diff --git a/Dockerfile b/Dockerfile
index bfd033f..1e8afe3 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,15 +3,12 @@
 # Environment: Mono
 # Minimum Panel Version: 0.6.0
 # ----------------------------------
-FROM        alpine:edge
+FROM        frolvlad/alpine-mono
 
 MAINTAINER  Pterodactyl Software, <support@pterodactyl.io>
 
 RUN         apk update \
-            && apk upgrade \
-            && echo "http://nl.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \
-            && apk update \
-            && apk add --no-cache mono openssl curl \
+            && apk add --no-cache openssl curl \
             && adduser -D -h /home/container container
 
 USER        container
diff --git a/entrypoint.sh b/entrypoint.sh
index a7437bb..c39e96c 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,6 +1,4 @@
 #!/bin/ash
-sleep 2
-
 cd /home/container
 
 # Make internal Docker IP address available to processes.
@@ -11,4 +9,4 @@ MODIFIED_STARTUP=`eval echo $(echo ${STARTUP} | sed -e 's/{{/${/g' -e 's/}}/}/g'
 echo ":/home/container$ ${MODIFIED_STARTUP}"
 
 # Run the Server
-${MODIFIED_STARTUP}
+eval ${MODIFIED_STARTUP}