diff --git a/docker-compose.yaml b/docker-compose.yaml
index 4216223..a6c4817 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -470,26 +470,21 @@ services:
     image: gitea.psi.ch/images/up-mavt-suite-backend:0.9.1
     container_name: up-mavt-suite-backend
     environment:
-      MONGO_URI=mongodb://up-mavt-suite-mongo:27017/elicitation
-      FLASK_ENV=production
-      ADMIN_PASSWORD=${MCDA_UP_ADMIN_PASSWORD}
-      OAUTH2_CLIENT_SECRET=${MCDA_UP_OAUTH2_SECRET}
-      # Email / SMTP configuration
-      # DISABLE_EMAIL=false
-      SMTP_HOST=smtp.office365.com
-      SMTP_PORT=587
-      SMTP_USER=mcda@psi.ch
-      EMAIL_AUTH_MODE=oauth2
-      OAUTH2_TENANT_ID=50f89ee2-f910-47c5-9913-a6ea08928f11
-      OAUTH2_CLIENT_ID=201ba262-3c76-41fb-8942-dcefb7729caa
-      # OAuth2 client secret is injected from deployment environment variable:
-      # MCDA_UP_OAUTH2_SECRET
-      OAUTH2_SCOPE=https://outlook.office365.com/.default
-      # OAUTH2_TOKEN_URL=
-      OAUTH2_USERNAME=mcda@psi.ch
-      SMTP_USE_TLS=true
-      EMAIL_FROM=mcda@psi.ch
-      APP_BASE_URL=https://mcda-up-test.psi.ch/
+      MONGO_URI: mongodb://up-mavt-suite-mongo:27017/elicitation
+      FLASK_ENV: production
+      ADMIN_PASSWORD: ${MCDA_UP_ADMIN_PASSWORD}
+      OAUTH2_CLIENT_SECRET: ${MCDA_UP_OAUTH2_SECRET}
+      SMTP_HOST: smtp.office365.com
+      SMTP_PORT: 587
+      SMTP_USER: mcda@psi.ch
+      EMAIL_AUTH_MODE: oauth2
+      OAUTH2_TENANT_ID: 50f89ee2-f910-47c5-9913-a6ea08928f11
+      OAUTH2_CLIENT_ID: 201ba262-3c76-41fb-8942-dcefb7729caa
+      OAUTH2_SCOPE: https://outlook.office365.com/.default
+      OAUTH2_USERNAME: mcda@psi.ch
+      SMTP_USE_TLS: true
+      EMAIL_FROM: mcda@psi.ch
+      APP_BASE_URL: https://mcda-up-test.psi.ch/
     depends_on:
       - up-mavt-suite-mongo
     networks: