diff --git a/docker/Dockerfile b/docker/Dockerfile
index b11c738..e714896 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -5,15 +5,21 @@
 # since 2019-09-05
 MAINTAINER Pascal Gollor <kalle@pgollor.de>
 
-USER root
+# environment variables
+ENV DASH_HOME /srv/dash
+
 RUN apk update
 RUN apk add scapy
 #RUN apt-get update -qq && apt-get install -qq -y python-scapy tcpdump tcpreplay wireshark python-requests
 RUN rm -rf /var/cache/apk/*
 
-RUN useradd -m -s /bin/bash amzn-dash
-RUN echo amzn-dash:amzn-dash | chpasswd
+# working directory
+WORKDIR $DASH_HOME
 
-USER root
-ADD dash-listen.py /home/amzn-dash/dash-listen.py
-CMD python /home/amzn-dash/dash-listen.py
+# copy files
+ADD dash-listen.py ./dash-listen.py
+COPY docker-entrypoint.sh /
+RUN chmod +x /docker-entrypoint.sh
+
+ENTRYPOINT ["/docker-entrypoint.sh"]
+CMD python ./dash-listen.py
diff --git a/docker/docker-entrypoint.sh b/docker/docker-entrypoint.sh
new file mode 100644
index 0000000..d9d4bac
--- /dev/null
+++ b/docker/docker-entrypoint.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+set -e
+
+# check for exisitng user and create it if necessary
+if ! id -u dash >/dev/null 2>&1; then
+	echo "create dash user"
+	adduser -u 1000 -D -g '' -h $DASH_HOME dash
+fi
+
+# update user rights
+chown -R dash:dash $DASH_HOME
+
+exec "$@"
+