diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index 3111f1f5..e3248139 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -41,7 +41,7 @@ services:
     restart: always
 
   caddy:
-    image: caddy:2.6.2
+    image: caddy:2.8.4
     container_name: caddy
     env_file: ./netmaker.env
     restart: unless-stopped
diff --git a/docker/Caddyfile b/docker/Caddyfile
index 1226b72b..9f5b3565 100644
--- a/docker/Caddyfile
+++ b/docker/Caddyfile
@@ -25,6 +25,10 @@ https://api.{$NM_DOMAIN} {
 }
 
 # MQ
-wss://broker.{$NM_DOMAIN} {
-	reverse_proxy ws://mq:8883 # For EMQX websockets use `reverse_proxy ws://mq:8083`
+broker.{$NM_DOMAIN} {
+	@ws {
+			header Connection *Upgrade*
+			header Upgrade websocket
+		}
+	reverse_proxy @ws mq:8883   # For EMQX websockets use `reverse_proxy @ws mq:8083`
 }
diff --git a/docker/Caddyfile-pro b/docker/Caddyfile-pro
index e986a8be..226f6170 100644
--- a/docker/Caddyfile-pro
+++ b/docker/Caddyfile-pro
@@ -40,6 +40,10 @@ https://api.{$NM_DOMAIN} {
 }
 
 # MQ
-wss://broker.{$NM_DOMAIN} {
-	reverse_proxy ws://mq:8883
+broker.{$NM_DOMAIN} {
+	@ws {
+			header Connection *Upgrade*
+			header Upgrade websocket
+		}
+	reverse_proxy @ws mq:8883
 }