diff --git a/docker-compose.yaml b/docker-compose.yaml
index 194c9cd..64eb942 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -93,12 +93,19 @@ services:
   # Also installed on docker-dmz
   # PSI Service
   # MCDA DSS
-  mcda-dss:secrets:
-  admin_password:
-    file: ./secrets/admin_password.txt
-  oauth2_client_secret:
-    file: ./secrets/oauth2_client_secret.txt
+  mcda-dss:
+    image: gitea.psi.ch/images/mcda-dss:0.1.0
+    container_name: mcda-dss
+    restart: always
+    networks:
+      - backend
 
+  # MCDA Calculator
+  mcda-calculator:
+    image: gitea.psi.ch/images/mcda-calculator:1.0.3
+    container_name: mcda-calculator
+    restart: always
+    networks:
       - backend
 
   # MCDA SRF tool
@@ -466,12 +473,8 @@ services:
       - .env
     environment:
       MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation
-      FLASK_ENV: production
-      ADMIN_PASSWORD_FILE: /run/secrets/admin_password
-      OAUTH2_CLIENT_SECRET_FILE: /run/secrets/oauth2_client_secret
-    secrets:
-      - admin_password
-      - oauth2_client_secret
+      FLASK_ENV: development
+      ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD}
     depends_on:
       - up-mavt-suite-mongo
     networks:
@@ -500,12 +503,6 @@ services:
       - backend
     restart: always
 
-secrets:
-  admin_password:
-    file: ./secrets/admin_password.txt
-  oauth2_client_secret:
-    file: ./secrets/oauth2_client_secret.txt
-
 networks:
   public:
   backend: