diff --git a/Dockerfile b/Dockerfile
index 7d60626..9d1b4e8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,15 @@
 # Base on latest (edge) alpine image
-FROM harbor.ervine.dev/library/x86_64/alpine/alpine:3.12
+FROM harbor.ervine.dev/public/x86_64/alpine/alpine:v3.12
 
-MAINTAINER “Jonathan Ervine” <docker@ervine.org>
+LABEL Maintainer=“Jonathan Ervine <docker@ervine.org>"
 
 # Install updates
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
     TERM='xterm' \
     VERSION='develop' \
-    SONARR_USER='mediaservice' \
-    SONARR_GROUP='mediaservice' \
+    SONARR_USER='sonarr' \
+    SONARR_GROUP='sonar' \
     SONARR_UID='1003' \
     SONARR_GID='1003'
 
@@ -25,8 +25,6 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie
   rm -rf /tmp/src && \
   rm -rf /var/cache/apk/*
 
-ADD start.sh /usr/local/bin/start.sh
-
 RUN wget https://update.sonarr.tv/v2/master/mono/NzbDrone.master.tar.gz -O nzbdrone.tar.gz && \
   tar zxvf nzbdrone.tar.gz && \
   rm -rf nzbdrone.tar.gz && \
@@ -38,4 +36,4 @@ EXPOSE 8989
 
 USER $SONARR_USER
 
-CMD [ "/usr/local/bin/start.sh" ]
+CMD [ "/usr/bin/mono", "--debug", "/NzbDrone/NzbDrone.exe", "--nobrowser", "--data=/config" ]
diff --git a/Jenkinsfile b/Jenkinsfile
index dd4e349..65fc1f8 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -27,7 +27,7 @@ spec:
     stage('Build with Kaniko') {
       git url: 'ssh://git@git.ervine.org/jonny/x86_64-alpine-sonarr.git', credentialsId: 'jenkins-to-git'
       container('kaniko') {
-        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/library/x86_64/alpine/sonarr:2.0.0.5344 --destination=harbor.ervine.dev/library/x86_64/alpine/sonarr:2'
+        sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=true --destination=harbor.ervine.dev/library/x86_64/alpine/sonarr:2.0.0.5344 --destination=harbor.ervine.dev/library/x86_64/alpine/sonarr:2 --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:2.0.0.5344 --destination=harbor.ervine.dev/public/x86_64/alpine/sonarr:2'
       }
     }
   }