diff --git a/docker-api.Dockerfile b/docker-api.Dockerfile
index ca6778429..c56639416 100644
--- a/docker-api.Dockerfile
+++ b/docker-api.Dockerfile
@@ -2,9 +2,10 @@ FROM    ruby:2.5
 RUN     apt-get update -qq && apt-get install -y \
   build-essential \
   libpq-dev \
-  nodejs \
   postgresql \
   postgresql-contrib
+RUN curl -sL https://deb.nodesource.com/setup_8.x | bash -
+RUN apt-get install -y nodejs
 RUN     mkdir /farmbot
 WORKDIR /farmbot
 COPY    . /farmbot
diff --git a/docker-compose.yml b/docker-compose.yml
index f6962474a..266e35653 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -6,6 +6,14 @@ services:
       - ./docker_volumes/db:/var/lib/postgresql/data
     env_file:
       - ./.env
+  mqtt:
+    build: ./mqtt
+    ports:
+     - "5672:5672"   # AMQP (RabbitMQ)
+     - "1883:1883"   # MQTT
+     - "8883:8883"   # MQTT over TLS/SSL
+     - "3002:15675"  # MQTT over WebSockets
+     - "15672:15672" # Management API
   web:
     build:
       context: .
@@ -15,7 +23,8 @@ services:
     volumes:
       - .:/farmbot
     ports:
-      - "3000:3000"
+      - "3000:3000" # Web / API
+      - "3808:3808" # Webpack Dev Server
     depends_on:
       - db
     env_file: