diff --git a/docker-compose.override.yml b/docker-compose.override.yml
new file mode 100644
index 0000000000000000000000000000000000000000..737b98523896da7c24869ad7e3e98d7f909d015d
--- /dev/null
+++ b/docker-compose.override.yml
@@ -0,0 +1,7 @@
+version: "2"
+
+services:
+  nginx:
+    ports:
+      - "80:80"
+      - "8080:8080"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
new file mode 100644
index 0000000000000000000000000000000000000000..f98c0a532f0a558f32d435867fa6efa51e3c5040
--- /dev/null
+++ b/docker-compose.prod.yml
@@ -0,0 +1,17 @@
+version: "2"
+
+networks:
+  webproxy:
+    default:
+    external: true
+
+services:
+  nginx:
+    environment:
+      VIRTUAL_HOST: web.villas.fein-aachen.org
+      LETSENCRYPT_HOST: web.villas.fein-aachen.org
+      LETSENCRYPT_EMAIL: post@steffenvogel.de
+    networks:
+      - default
+      - webproxy
+
diff --git a/docker-compose.yml b/docker-compose.yml
index d81b5d0e4da4608b0ba87ede92ff5888b66fe5d6..1c4cbbbd27ba303c1435636a40818876882fdd7b 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,10 +1,5 @@
 version: "2"
 
-networks:
-  default:
-  webproxy:
-    external: true
-
 volumes:
   database:
     driver: local
@@ -34,16 +29,6 @@ services:
     build:
       context: .
       dockerfile: Dockerfile.nginx
-#    ports:
-#      - "80:80"
-#      - "8080:8080"
-    environment:
-      VIRTUAL_HOST: web.villas.fein-aachen.org
-      LETSENCRYPT_HOST: web.villas.fein-aachen.org
-      LETSENCRYPT_EMAIL: post@steffenvogel.de     
-    networks:
-      - webproxy
-      - default
 
   # The MongoDB database for the VILLASweb backend
   database:
@@ -61,7 +46,7 @@ services:
       dockerfile: Dockerfile.node
     privileged: true
     restart: always
-    command: node /etc/villas/node/websocket-demo-files.conf
+    command: node /etc/villas/node/websocket-demo.conf
     volumes:
       - ./etc/node:/etc/villas/node
     ports:
@@ -75,6 +60,8 @@ services:
       ME_CONFIG_MONGODB_SERVER: database
       ME_CONFIG_BASICAUTH_USERNAME: admin
       ME_CONFIG_BASICAUTH_PASSWORD: mongo-admin
+    depends_on:
+      - database
     ports:
       - "8081:8081"
 
@@ -85,10 +72,8 @@ services:
       RABBITMQ_DEFAULT_USER: "villas"
       RABBITMQ_DEFAULT_PASS: "s3c0sim4!"
     ports:
-      - "8080:15672"
+      - "8082:15672"
       - "5672:5672"
-    networks:
-      - default
 
   # A VILLAScontroller for creating some dummy simulators
   controller:
@@ -98,5 +83,3 @@ services:
     command: villas-ctl -b "amqp://villas:s3c0sim4!@broker/%2F" -c /etc/villas/controller/config.json daemon
     depends_on:
       - broker
-    networks:
-      - default