diff --git a/apache/conf/niagadm.conf b/apache/conf/niagadm.conf
new file mode 100644
index 0000000..0797b18
--- /dev/null
+++ b/apache/conf/niagadm.conf
@@ -0,0 +1,28 @@
+<VirtualHost *:80>
+    ServerName niagadm.psi.ch
+    DocumentRoot /var/www/niagadm
+
+    # Allow CGI everywhere if needed
+    Options +ExecCGI
+    AddHandler cgi-script .pl .cgi .x .py
+
+    <Directory "/var/www/niagadm">
+        Options +ExecCGI
+        AllowOverride None
+        Require all granted
+    </Directory>
+
+    # Explicit CGI directories
+    ScriptAlias /cgi-bin/ /var/www/niagadm/cgi-bin/
+    <Directory "/var/www/niagadm/cgi-bin">
+        Options +ExecCGI
+        Require all granted
+    </Directory>
+
+    ScriptAlias /cgibin/ /var/www/niagadm/cgibin/
+    <Directory "/var/www/niagadm/cgibin">
+        Options +ExecCGI
+        Require all granted
+    </Directory>
+</VirtualHost>
+
diff --git a/conf.d/niagadm.conf b/conf.d/niagadm.conf
new file mode 100644
index 0000000..505626c
--- /dev/null
+++ b/conf.d/niagadm.conf
@@ -0,0 +1,30 @@
+server {
+    listen 80;
+    server_name niagadm.psi.ch;
+
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name niagadm.psi.ch;
+
+    ssl_certificate     /etc/nginx/certs/niagadm.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/niagadm.psi.ch.key;
+
+    access_log /var/log/nginx/niagadm.access.log;
+    error_log  /var/log/nginx/niagadm.error.log;
+
+    # Proxy EVERYTHING to the Apache container
+    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;
+
+        # Important for CGI apps
+        proxy_buffering off;
+    }
+}
+
diff --git a/docker-compose.yaml b/docker-compose.yaml
index 732a37d..5df878b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -37,6 +37,7 @@ services:
       - /opt/webcontent/fluid-eos:/var/www/fluid-eos:rw
       - /opt/webcontent/sls2:/var/www/sls2:rw
       - /opt/webcontent/megwiki:/var/www/megwiki:rw
+      - /opt/webcontent/niagadm:/var/www/niagadm:rw
       - /mount/srem/webhosting:/var/www/srem:rw
       - ./apache/conf:/etc/apache2/sites-enabled:ro
     networks: