diff --git a/wis2box-broker/Dockerfile b/wis2box-broker/Dockerfile
index d3dce3ed..a613d7b2 100644
--- a/wis2box-broker/Dockerfile
+++ b/wis2box-broker/Dockerfile
@@ -19,7 +19,7 @@
 #
 ###############################################################################
 
-FROM eclipse-mosquitto
+FROM eclipse-mosquitto:2.0.15
 
 RUN mkdir -p /data/wis2box/mosquitto
 RUN ln -s /mosquitto /data/wis2box/mosquitto
diff --git a/wis2box-broker/entrypoint.sh b/wis2box-broker/entrypoint.sh
index 203359cb..dee09a01 100644
--- a/wis2box-broker/entrypoint.sh
+++ b/wis2box-broker/entrypoint.sh
@@ -10,7 +10,6 @@ if [ -f /tmp/wis2box.crt ]; then
     cp /mosquitto/config/mosquitto-ssl.conf /mosquitto/config/mosquitto.conf
 else
     echo "SSL disabled"
-    cp /mosquitto/config/mosquitto.conf /mosquitto/config/mosquitto.conf
 fi
 
 echo "Setting mosquitto authentication"