diff --git a/docker-compose.yml b/docker-compose.yml
index b3db1fa8510dc48deeabfe31e2b8fa40c8939177..9143b6ee2cabe29eea751c91f10a893d2be416af 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -43,6 +43,7 @@ services:
      - backend
      - frontend
      - relay
+     - doc
     restart: always
 
   # The MongoDB database for the VILLASweb backend
@@ -112,3 +113,10 @@ services:
     depends_on:
       - broker
     restart: always
+
+  # VILLAS Documentation
+  doc:
+    build:
+      context: doc
+    image: registry.git.rwth-aachen.de/acs/public/villas/demo/documentation
+    restart: always
diff --git a/etc/nginx/default.conf b/etc/nginx/default.conf
index b3aa9d2bc96a93d10b3b462265462c7373da76eb..8f749be46ed81ed3ce53a3f97f1e1cddee5776d8 100644
--- a/etc/nginx/default.conf
+++ b/etc/nginx/default.conf
@@ -59,6 +59,10 @@ server {
     proxy_pass http://backend:4000/public;
   }
 
+  location /doc {
+    proxy_pass http://doc/doc;
+  }
+
   location /ws/api {
     proxy_pass http://node/api;
   }