diff --git a/Dockerfile b/Dockerfile
index cb112ec..58e776e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -18,12 +18,12 @@ COPY start.sh /usr/local/bin/
 
 RUN \
   groupadd -r -g $GID $GROUP && \
-  useradd -m -r -u $UID -g $GROUP $USER
+  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} && \
-  chown $USER:$GROUP ${DATA_DIR}
+  chown ${USER}:${GROUP} ${DATA_DIR}
 
 USER ${USER}