diff --git a/Dockerfile b/Dockerfile
index f8b9805..051bd62 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,8 +7,11 @@ MAINTAINER “Jonathan Ervine” <docker@ervine.org>
 # Create mediaservice user
 ENV LANG='en_US.UTF-8' \
     LANGUAGE='en_US.UTF-8' \
-    BUILD_DATE='06-04-2020' \
-    TERM='xterm'
+    BUILD_DATE='27-07-2020' \
+    TERM='xterm' \
+    WATCHER_USER=watcher \
+    WATCHER_UID=1003 \
+    WATCHER_GID=1003 \
 
 RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositories && \
     apk update && \
@@ -18,10 +21,14 @@ RUN echo http://dl-4.alpinelinux.org/alpine/edge/testing >> /etc/apk/repositorie
 ADD UTC /etc/localtime
 
 RUN git clone https://github.com/barbequesauce/watcher3 && \
-    rm -rf /var/cache/apk/* 
-
-ADD start.sh /usr/local/bin/start.sh
+    rm -rf /var/cache/apk/* && \
+    addgroup -g $WATCHER_GID $WATCHER_USER && \
+    adduser -D -u $WATCHER_UID -G $WATCHER_USER -H $WATCHER_USER && \
+    chown -R $WATCHER_UID:$WATCHER_GID /watcher3
 
 EXPOSE 9090
 
-CMD [ "/usr/local/bin/start.sh" ]
+USER $WATCHER_USER
+
+CMD [ "/usr/bin/python3", "/watcher3/watcher.py", "--userdata=/config/" ]
+