diff --git a/Dockerfile b/Dockerfile
index 10b7226..fd6c4f6 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -8,7 +8,10 @@ ENV BROKER "mqtt://127.0.0.1"
 ENV DATA_DIR "/opt/app"
 ENV STORAGE_DIR "/opt/app/storage"
 
+COPY start.sh /usr/local/bin/
+
 RUN \
+  chmod 755 /usr/local/bin/start.sh && \
   npm install -g homekit2mqtt --unsafe-perm && \
   mkdir -p ${DATA_DIR} && \
   touch ${DATA_DIR}/mapping.json && \
@@ -19,6 +22,6 @@ VOLUME ${DATA_DIR}
 EXPOSE 51826
 EXPOSE 51888
 
-CMD [ "homekit2mqtt", "-m", "$DATA_DIR/mapping.json", "-u", "$BROKER", "-s", "$STORAGE_DIR", "--insecure", "--pincode=$PIN" ]
+CMD [ "/usr/local/bin/start.sh" ]
  
 
diff --git a/start.sh b/start.sh
new file mode 100644
index 0000000..5673f7e
--- /dev/null
+++ b/start.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+/usr/local/bin/homekit2mqtt -m $DATA_DIR/mapping.json -u $BROKER --insecure -c $PIN
+