diff --git a/Dockerfile b/Dockerfile
index 754b999..cb112ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,13 +8,24 @@ ENV BROKER "mqtt://mosquitto"
 ENV DATA_DIR "/opt/app"
 ENV STORAGE_DIR "/opt/app/storage"
 
+ARG USER="homekit"
+ARG UID="51888"
+ARG GROUP="homekit"
+ARG GID="51888"
+
+
 COPY start.sh /usr/local/bin/
 
 RUN \
+  groupadd -r -g $GID $GROUP && \
+  useradd -m -r -u $UID -g $GROUP $USER
   chmod 755 /usr/local/bin/start.sh && \
   npm install -g homekit2mqtt --unsafe-perm && \
   mkdir -p ${DATA_DIR} && \
-  mkdir -p ${STORAGE_DIR}
+  mkdir -p ${STORAGE_DIR} && \
+  chown $USER:$GROUP ${DATA_DIR}
+
+USER ${USER}
   
 COPY mapping.json ${DATA_DIR}