diff --git a/Dockerfile b/Dockerfile
index b63f916..177106a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,16 @@
 # 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='2.5.3'
+    VERSION='2.5.3' \
+    TAUT_USER='tautulli' \
+    TAUT_UID=1003 \
+    TAUT_GID=1003
 
 RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
   apk update && \
@@ -21,10 +24,12 @@ RUN wget https://github.com/Tautulli/Tautulli/archive/v$VERSION.tar.gz && \
   tar zxvf v$VERSION.tar.gz -C / && \
   mv /Tautulli-$VERSION /Tautulli && \
   rm *.tar.gz && \
-  rm -rf /var/cache/apk/* 
-
-COPY start.sh /usr/local/bin/start.sh
+  rm -rf /var/cache/apk/* && \
+  addgroup -g $TAUT_GID $TAUT_USER && \
+  adduser -D -u $TAUT_UID -G $TAUT_USER -H $TAUT_USER
 
 EXPOSE 8181
 
-CMD [ "/usr/local/bin/start.sh" ]
+USER $TAUT_USER
+
+CMD [ "/usr/bin/python3", "/Tautulli/Tautulli.py", "--datadir /config", "--nofork", "--nolaunch" ]
diff --git a/tautulli.png b/tautulli.png
new file mode 100644
index 0000000..3b4e74d
Binary files /dev/null and b/tautulli.png differ