diff --git a/Dockerfile.nginx b/Dockerfile.nginx
new file mode 100644
index 0000000..14e8087
--- /dev/null
+++ b/Dockerfile.nginx
@@ -0,0 +1,3 @@
+FROM nginx:stable-alpine
+
+COPY etc/nginx/villas.conf /etc/nginx/conf.d/default.conf
diff --git a/Dockerfile.node b/Dockerfile.node
new file mode 100644
index 0000000..a778e3c
--- /dev/null
+++ b/Dockerfile.node
@@ -0,0 +1,3 @@
+FROM villas/node:latest
+
+COPY etc/node/*.conf /etc/villas/node/
diff --git a/docker-compose.yml b/docker-compose.yml
index 7dbf6f3..6e984cf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,12 +17,12 @@ services:
     command: "/bin/true"
 
   nginx:
-    image: nginx:stable-alpine
+    build:
+      context: .
+      dockerfile: Dockerfile.nginx
     ports:
       - "80:80"
       - "443:443"
-    volumes:
-      - "./etc/nginx/villas.conf:/etc/nginx/conf.d/default.conf"
     volumes_from:
       - frontend
     networks:
@@ -51,23 +51,24 @@ services:
       villas:
 
   # AMQP broker for VILLAScontroller
-  broker:
-    image: rabbitmq:management
-    environment:
-      RABBITMQ_DEFAULT_USER: "villas"
-      RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
-    ports:
-      - "8080:15672"
-      - "5672:5672"
-    networks:
-      villas:
+#  broker:
+#    image: rabbitmq:management
+#    environment:
+#      RABBITMQ_DEFAULT_USER: "villas"
+#      RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
+#    ports:
+#      - "8080:15672"
+#      - "5672:5672"
+#    networks:
+#      villas:
 
   # VILLASnode, the gateway between UDP and WebSocket traffic
   node:
-    image: villas/node:latest
+    build:
+      context: .
+      dockerfile: Dockerfile.node
     privileged: true
+    restart: always
     command: node /etc/villas/node/websocket-demo.conf
-    volumes:
-      - "./etc/node/:/etc/villas/node/"
     networks:
       villas: