diff --git a/Dockerfile b/Dockerfile
index b948957..6678bfd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,32 +7,22 @@ MAINTAINER “Jonathan Ervine” <docker@ervine.org>
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
     TERM='xterm' \
-    VERSION='0.2.0.1504' \
-    RADARR_USER='mediaservice' \
-    RADARR_GROUP='mediaservice' \
-    RADARR_UID='1003' \
-    RADARR_GID='1003'
+    VERSION='0.2.0.1504'
 
 RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
   apk -U update && \
-  apk -U upgrade && \
+  apk -U upgrade --ignore alpine-baselayout&& \
   apk -U add libmediainfo ca-certificates mono curl && \
   apk del make gcc g++ && \
   rm -rf /tmp/src && \
   rm -rf /var/cache/apk/*
 
 ADD start.sh /usr/local/bin/start.sh
-RUN chmod 755 /usr/local/bin/start.sh
 
 RUN curl -Lo radarr.tar.gz https://github.com/Radarr/Radarr/releases/download/v$VERSION/Radarr.develop.$VERSION.linux.tar.gz && \
   tar zxvf radarr.tar.gz && \
-  rm -rf radarr.tar.gz && \
-  addgroup -g $RADARR_GID $RADARR_GROUP && \
-  adduser -D -u $RADARR_UID -G $RADARR_GROUP -H $RADARR_USER && \
-  chown -R $RADARR_USER:$RADARR_GROUP /Radarr
+  rm -rf radarr.tar.gz && 
 
 EXPOSE 7878
 
-USER $RADARR_USER
-
 CMD [ "/usr/local/bin/start.sh" ]
diff --git a/start.sh b/start.sh
old mode 100644
new mode 100755
index 7d0f00d..37fda53
--- a/start.sh
+++ b/start.sh
@@ -1,6 +1,8 @@
 #!/bin/sh
 ##
-## Script to start the sonarr server
+## Script to start the radarr server
 ##
+addgroup -g $GID $USER
+adduser -D -u $UID -G $USER -H $USER
 until [ -f "/config/nzbdrone.db" ]; do sleep 10; done
-/usr/bin/mono --debug /Radarr/Radarr.exe --nobrowser --data=/config
+su - $USER -c "/usr/bin/mono --debug /Radarr/Radarr.exe --nobrowser --data=/config"