diff --git a/conf.d/mcda-up.psi.ch.conf b/conf.d/mcda-up.psi.ch.conf
new file mode 100644
index 0000000..8adbdd3
--- /dev/null
+++ b/conf.d/mcda-up.psi.ch.conf
@@ -0,0 +1,29 @@
+server {
+    listen 80;
+    server_name mcda-up-test.psi.ch;
+    return 301 https://$host$request_uri;
+}
+
+server {
+    listen 443 ssl;
+    server_name mcda-up-test.psi.ch;
+
+    ssl_certificate /etc/nginx/certs/mcda-up-test.psi.ch.crt;
+    ssl_certificate_key /etc/nginx/private/mcda-up-test.psi.ch.key;
+
+    location /api/ {
+        proxy_pass http://up-mavt-suite-backend:5000/api/;
+        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;
+    }
+
+    location / {
+        proxy_pass http://up-mavt-suite-frontend:3000;
+        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 3b366bd..4cea248 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -453,6 +453,58 @@ services:
       - tomcatwiki_backend
       - backend
 
+  # Simone Pagliuca <simone.pagliuca@psi.ch> / River Huang <river.huang@psi.ch>
+  # UP-MAVT-Suite
+  up-mavt-suite-mongo:
+    image: mongo:7.0
+    container_name: up-mavt-suite-mongo
+    environment:
+      MONGO_INITDB_DATABASE: elicitation
+    volumes:
+      - /opt/webcontent/up-mavt-suite/mongo-data:/data/db
+    networks:
+      - up_mavt_suite_network
+    restart: always
+
+  up-mavt-suite-backend:
+    image: gitea.psi.ch/images/up-mavt-suite-backend:0.1.0
+    container_name: up-mavt-suite-backend
+    env_file:
+      - .env
+    environment:
+      MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation
+      FLASK_ENV: development
+      ADMIN_PASSWORD: ${ADMIN_PASSWORD}
+    depends_on:
+      - up-mavt-suite-mongo
+    networks:
+      - up_mavt_suite_network
+      - backend
+    restart: always
+
+  up-mavt-suite-worker:
+    image: gitea.psi.ch/images/up-mavt-suite-worker:0.1.0
+    container_name: up-mavt-suite-worker
+    environment:
+      MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation
+    depends_on:
+      - up-mavt-suite-mongo
+    networks:
+      - up_mavt_suite_network
+    restart: always
+
+  up-mavt-suite-frontend:
+    image: gitea.psi.ch/images/up-mavt-suite-frontend:0.1.0
+    container_name: up-mavt-suite-frontend
+    environment:
+      VITE_API_URL: http://localhost:5000/api
+    depends_on:
+      - up-mavt-suite-backend
+    networks:
+      - up_mavt_suite_network
+      - backend
+    restart: always
+
 networks:
   public:
   backend:
@@ -460,4 +512,5 @@ networks:
   it_strategy_dashboard_backend:
   panda_maintenance_backend:
   tomcatwiki_backend:
+  up_mavt_suite_network: