diff --git a/conf.d/tcpwiki.conf b/conf.d/tcpwiki.conf
new file mode 100644
index 0000000..eb87ac0
--- /dev/null
+++ b/conf.d/tcpwiki.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name tcpwiki.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name tcpwiki.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/tcpwiki.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/tcpwiki.psi.ch.key;
+
+    location / {
+        proxy_pass http://tcpwiki:8080;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+    }
+}
diff --git a/docker-compose.yaml b/docker-compose.yaml
index aef46ad..17c3efd 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -49,6 +49,15 @@ services:
     networks: 
       - backend
 
+  tcpwiki:
+    image: dokuwiki/dokuwiki:latest
+    container_name: tcpwiki
+    restart: always
+    volumes:
+      - /opt/webcontent/tcpwiki:/storage
+    networks:
+      - backend
+
 networks:
   public:
   backend: