diff --git a/Dockerfile.broker b/Dockerfile.broker
new file mode 100644
index 0000000000000000000000000000000000000000..a19716d52e5b915504c1823c8924752b86526680
--- /dev/null
+++ b/Dockerfile.broker
@@ -0,0 +1,2 @@
+FROM rabbitmq:management
+RUN rabbitmq-plugins enable --offline rabbitmq_mqtt
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 7cb6bad1538a97229d1a1ab2826b34a8cf2ad46d..adbfb722e5a59675825a7c48a2b6aa882245fd29 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -80,13 +80,16 @@ services:
 
   # AMQP broker for VILLAScontroller
   broker:
-    image: rabbitmq:management
+    build:
+      context: .
+      dockerfile: Dockerfile.broker
     environment:
       RABBITMQ_DEFAULT_USER: "villas"
       RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
     ports:
       - "8083:15672"
       - "5672:5672"
+      - "1883:1883"
     restart: always
 
   # A VILLAScontroller for creating some dummy simulators