diff --git a/.dockerignore b/.dockerignore
index d525a859..87b5c14b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,3 +7,4 @@ package
 pylintrc
 *.md
 !CHANGELOG*.md
+start.bat
diff --git a/Dockerfile b/Dockerfile
index fb594153..d30dc3be 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,7 +16,7 @@ RUN \
 
 COPY . /app
 
-CMD [ "python", "Tautulli.py", "--datadir", "/config" ]
+ENTRYPOINT [ "./start.sh" ]
 
 VOLUME /config
 EXPOSE 8181
diff --git a/start.sh b/start.sh
index f1332bc9..79fbbcd8 100755
--- a/start.sh
+++ b/start.sh
@@ -1,2 +1,12 @@
 #!/usr/bin/env bash
-python Tautulli.py &> /dev/null &
\ No newline at end of file
+
+if [[ "$TAUTULLI_DOCKER" = "True" ]]; then
+    PUID=${PUID:-1000}
+    PGID=${PGID:-1000}
+    getent group tautulli 2>&1 > /dev/null || groupadd -g "$PGID" tautulli
+    getent passwd tautulli 2>&1 > /dev/null || useradd -r -u "$PUID" -g tautulli tautulli
+    chown -f -R tautulli:tautulli /config
+    python Tautulli.py --datadir /config
+else
+    python Tautulli.py &> /dev/null &
+fi