diff --git a/Dockerfile b/Dockerfile
index fd6c4f6..754b999 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -4,7 +4,7 @@ LABEL Maintainer="Wolfgang Hottgenroth <woho@hottis.de>"
 LABEL ImageName="registry.gitlab.com/wolutator/hkd"
 
 ENV PIN "031-45-154"
-ENV BROKER "mqtt://127.0.0.1"
+ENV BROKER "mqtt://mosquitto"
 ENV DATA_DIR "/opt/app"
 ENV STORAGE_DIR "/opt/app/storage"
 
@@ -14,9 +14,9 @@ RUN \
   chmod 755 /usr/local/bin/start.sh && \
   npm install -g homekit2mqtt --unsafe-perm && \
   mkdir -p ${DATA_DIR} && \
-  touch ${DATA_DIR}/mapping.json && \
   mkdir -p ${STORAGE_DIR}
   
+COPY mapping.json ${DATA_DIR}
 
 VOLUME ${DATA_DIR}
 EXPOSE 51826
diff --git a/mapping.json b/mapping.json
new file mode 100644
index 0000000..bfd870e
--- /dev/null
+++ b/mapping.json
@@ -0,0 +1,3 @@
+{
+}
+