diff --git a/compose/docker-compose.contained.yml b/compose/docker-compose.contained.yml
index aa3ea175..2d2ef308 100644
--- a/compose/docker-compose.contained.yml
+++ b/compose/docker-compose.contained.yml
@@ -68,9 +68,20 @@ services:
       # - $PWD/site:/srv # you could also serve a static site in site folder
       - caddy_data:/data
       - caddy_conf:/config
+  mosquitto:
+    image: eclipse-mosquitto:2.0.14
+    container_name: broker
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - /root/mosquitto.conf:/mosquitto/config/mosquitto.conf
+      - mosquitto_data:/var/lib/mosquitto
+      - mosquitto_logs:/var/log/mosquitto/mosquitto.log
 volumes:
   caddy_data: {}
   caddy_conf: {}
   sqldata: {}
   dnsconfig: {}
+  mosquitto_data: {}
+  mosquitto_logs: {}
 
diff --git a/docker/mosquitto.conf b/docker/mosquitto.conf
new file mode 100644
index 00000000..20ab6597
--- /dev/null
+++ b/docker/mosquitto.conf
@@ -0,0 +1,10 @@
+persitance true
+persistance_location /var/lib/mosquitto/
+
+log_dest_file /var/log/mosquitto/mosquitto.log
+
+per_listener_settings true
+listener 1883
+allow_anonymous true
+bind_interface SERVER_PUBLIC_IP
+
diff --git a/scripts/install-netmaker.sh b/scripts/install-netmaker.sh
index 52232d9a..547dca88 100644
--- a/scripts/install-netmaker.sh
+++ b/scripts/install-netmaker.sh
@@ -136,6 +136,9 @@ echo "Setting Caddyfile..."
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/Caddyfile
 sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
 
+echo "Setting Broker..."
+sed -i "s/SERVER_PBLIC_IP/$SERVER_PUBLIC_IP/g" /root/mosquitto.conf
+
 echo "Setting docker-compose..."
 
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/docker-compose.yml
diff --git a/scripts/nm-quick.sh b/scripts/nm-quick.sh
index 507e6258..8a9bead4 100755
--- a/scripts/nm-quick.sh
+++ b/scripts/nm-quick.sh
@@ -135,6 +135,10 @@ wget -q -O /root/Caddyfile https://raw.githubusercontent.com/gravitl/netmaker/ma
 sed -i "s/NETMAKER_BASE_DOMAIN/$NETMAKER_BASE_DOMAIN/g" /root/Caddyfile
 sed -i "s/YOUR_EMAIL/$EMAIL/g" /root/Caddyfile
 
+echo "setting mosquitto.conf..."
+
+wget -q -O /root/mosquitto.conf https://raw.githubusercontent.com/gravil/netmaker/master/docker/mosquitto.conf
+sed -i "s/SERVER_PUBLIC_IP/$SERVER_PUBLIC_IP/g" /root/mosquitto.conf
 
 echo "setting docker-compose..."