diff --git a/apache/conf/tcpwiki.conf b/apache/conf/tcpwiki.conf
new file mode 100644
index 0000000..1f647a5
--- /dev/null
+++ b/apache/conf/tcpwiki.conf
@@ -0,0 +1,21 @@
+<VirtualHost *:80>
+    ServerName tcpwiki.psi.ch
+
+    DocumentRoot /var/www/tcpwiki
+
+    <Directory /var/www/tcpwiki>
+        AllowOverride All
+        Require all granted
+
+        Options FollowSymLinks
+        DirectoryIndex doku.php
+    </Directory>
+
+    RewriteEngine On
+
+    SetEnvIf X-Forwarded-Proto https HTTPS=on
+
+    ErrorLog  /var/log/apache2/dokuwiki_error.log
+    CustomLog /var/log/apache2/dokuwiki_access.log combined
+</VirtualHost>
+
diff --git a/conf.d/tcpwiki.conf b/conf.d/tcpwiki.conf
new file mode 100644
index 0000000..9152b5c
--- /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/lx-docker-dmz-01.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/lx-docker-dmz-01.psi.ch.key;
+
+    location / {
+        proxy_pass http://apache_app:80;
+        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 9bffaf1..a4bc3f9 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -33,6 +33,7 @@ services:
       - /opt/webcontent/DMZ/omny:/var/www/omny:rw
       - /opt/webcontent/DMZ/cas-status:/var/www/cas_status:rw
       - /mount/srem/webhosting:/var/www/srem:rw
+      - /mount/webhosting_dmz_write/tcpwiki:/var/www/tcpwiki:rw
       - ./apache/conf:/etc/apache2/sites-enabled:ro
     networks:
       - backend