diff --git a/Dockerfile.controller b/Dockerfile.controller
deleted file mode 100644
index fe8704fab7fc71fbc20b6989ce8b47a58dd12430..0000000000000000000000000000000000000000
--- a/Dockerfile.controller
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM rwthacs/dpsim-dev
-
-ENV PYCURL_SSL_LIBRARY openssl
-
-RUN dnf -y install \
-	python3 \
-	python3-pip \
-	curl \
-	libcurl-devel \
-	openssl-devel
-
-RUN pip3 install --upgrade pip
-RUN pip3 install \
-	pycurl \
-	gitpython
-
-COPY controller /controller
-COPY simulation /simulation
-
-WORKDIR /controller
-
-RUN mkdir -p /usr/local/lib/python3.6/site-packages/
-RUN python3 setup.py install
-
-COPY etc/controller/config.json /etc/villas/controller/config.json
diff --git a/controller b/controller
index e5fa2509623e43fa474d89b7595d7559828eec38..6cc1d55845a6e277a7135b083699b56ebe6a88d0 160000
--- a/controller
+++ b/controller
@@ -1 +1 @@
-Subproject commit e5fa2509623e43fa474d89b7595d7559828eec38
+Subproject commit 6cc1d55845a6e277a7135b083699b56ebe6a88d0
diff --git a/docker-compose.yml b/docker-compose.yml
index 9143b6ee2cabe29eea751c91f10a893d2be416af..43968305b2c0e62a59b506e1d0e934244f1ee1d6 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -103,13 +103,14 @@ services:
   # A VILLAScontroller for creating some dummy simulators
   controller:
     build:
-      context: .
-      dockerfile: Dockerfile.controller
+      context: controller
     image: registry.git.rwth-aachen.de/acs/public/villas/controller:demo-v0.1
-    command: villas-ctl -b "amqp://villas:s3c0sim4!@broker/%2F" -c /etc/villas/controller/config.json daemon
+    command: [
+      "wait-for", "broker:5672", "--",
+      "villas-ctl", "-b", "amqp://villas:s3c0sim4!@broker/%2F", "daemon"
+    ]
     volumes:
       - ./etc/villas/controller:/etc/villas/controller
-      - ./data:/data
     depends_on:
       - broker
     restart: always