diff --git a/conf.d/mcda-calculator.conf b/conf.d/mcda-calculator.conf
new file mode 100644
index 0000000..bc6591f
--- /dev/null
+++ b/conf.d/mcda-calculator.conf
@@ -0,0 +1,21 @@
+server {
+    listen 80;
+    server_name mcda-calculator.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name mcda-calculator.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/mcda-calculator.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/mcda-calculator.psi.ch.key;
+
+    location / {
+        proxy_pass http://mcda-calculator:8050;
+        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 d191146..839f5c3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -38,6 +38,11 @@ services:
     networks:
       - backend
 
+  mcda-calculator:
+    image: container.psi.ch/images/psi-mcda-calculator:latest
+    container_name: mcda-calculator
+    networks: backend
+
 networks:
   public:
   backend: