diff --git a/conf.d/panda-maintenance.conf b/conf.d/panda-maintenance.conf
index 3c1d7b2..e6f658b 100644
--- a/conf.d/panda-maintenance.conf
+++ b/conf.d/panda-maintenance.conf
@@ -11,8 +11,14 @@ server {
     ssl_certificate /etc/nginx/certs/panda-maintenance.psi.ch.crt;
     ssl_certificate_key /etc/nginx/private/panda-maintenance.psi.ch.key;
 
+
+    rewrite ^/$ /cmdbuild/ permanent;
     location / {
-        proxy_pass http://panda-maintenance-app:8080/cmdbuild;
+        return 404;
+    }
+
+    location /cmdbuild {
+        proxy_pass http://panda-maintenance-app: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;