diff --git a/docker-compose.yaml b/docker-compose.yaml
index 55c549c..13dc534 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -452,6 +452,60 @@ 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: unless-stopped
+
+  up-mavt-suite-backend:
+    image: gitea.psi.ch/images/up-mavt-suite-backend:0.1.0
+    container_name: up-mavt-suite-backend
+    ports:
+      - "5000:5000"
+    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
+    restart: unless-stopped
+
+  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: unless-stopped
+
+  up-mavt-suite-frontend:
+    image: gitea.psi.ch/images/up-mavt-suite-frontend:0.1.0
+    container_name: up-mavt-suite-frontend
+    ports:
+      - "3000:3000"
+    environment:
+      VITE_API_URL: http://localhost:5000/api
+    depends_on:
+      - up-mavt-suite-backend
+    networks:
+      - up_mavt_suite_network
+    restart: unless-stopped
+
 networks:
   public:
   backend:
@@ -459,4 +513,5 @@ networks:
   it_strategy_dashboard_backend:
   panda_maintenance_backend:
   tomcatwiki_backend:
+  up_mavt_suite_network: