diff --git a/compose/docker-compose.yml b/compose/docker-compose.yml
index c7e77ef9..01a6d6f1 100644
--- a/compose/docker-compose.yml
+++ b/compose/docker-compose.yml
@@ -27,7 +27,7 @@ services:
       NODE_ID: "netmaker-server-1"
       MQ_HOST: "mq"
       MQ_PORT: "443"      
-      MQ_SERVER_PORT: "1883"
+      MQ_SERVER_PORT: "8083"
       STUN_PORT: "3478"      
       VERBOSITY: "1"
       MQ_PASSWORD: "REPLACE_MQ_PASSWORD"
@@ -88,9 +88,10 @@ services:
       EMQX_DASHBOARD__DEFAULT_PASSWORD: "REPLACE_MQ_PASSWORD"
       EMQX_DASHBOARD__DEFAULT_USERNAME: "REPLACE_MQ_USERNAME"
     ports:
-      - "1883:1883"
-      - "8883:8883"
-      - "18083:18083"
+      - "1883:1883" # MQTT
+      - "8883:8883" # SSL MQTT
+      - "8083:8083" # Websockets
+      - "18083:18083" # Dashboard/REST_API
 volumes:
   caddy_data: {}
   caddy_conf: {}
diff --git a/mq/mq.go b/mq/mq.go
index b72b4d9d..4ba2f91e 100644
--- a/mq/mq.go
+++ b/mq/mq.go
@@ -40,11 +40,12 @@ func setMqOptions(user, password string, opts *mqtt.ClientOptions) {
 // SetupMQTT creates a connection to broker and return client
 func SetupMQTT() {
 	if servercfg.GetBrokerType() == emqxBrokerType {
-		time.Sleep(7 * time.Second) // wait for the REST endpoint to be ready
+		time.Sleep(10 * time.Second) // wait for the REST endpoint to be ready
 		// setup authenticator and create admin user
 		if err := CreateEmqxDefaultAuthenticator(); err != nil {
 			logger.Log(0, err.Error())
 		}
+		DeleteEmqxUser(servercfg.GetMqUserName())
 		if err := CreateEmqxUser(servercfg.GetMqUserName(), servercfg.GetMqPassword(), true); err != nil {
 			log.Fatal(err)
 		}