diff --git a/docker-compose.yaml b/docker-compose.yaml
index 11158ef..a6cacb3 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -148,12 +148,51 @@ services:
     networks:
       - backend
 
+  # Enea Zeolla <enea.zeolla@psi.ch>
   drsa-tiermaker:
-    image: gitea.psi.ch/images/drsa-tiermaker:0.2
+    image: gitea.psi.ch/images/drsa-tiermaker:0.1.5
     container_name: drsa-tiermaker
     restart: always
+    depends_on:
+      drsa-tiermaker-db:
+        condition: service_healthy
+    environment:
+      - DATABASE_URL=postgresql+psycopg2://${DRSA_TIERMAKER_DB_USER}:${DRSA_TIERMAKER_DB_PW}@drsa-tiermaker-db:5432/drsa_tiermaker
+      - SECRET_KEY=${DRSA_TIERMAKER_SECRET_KEY}
+      - FIRST_ADMIN_EMAIL=mcda@psi.ch
+      - FIRST_ADMIN_PASSWORD=${DRSA_TIERMAKER_ADMIN_PW}
+      - ENVIRONMENT=production
+      - COOKIE_SECURE=true
+      - DRSA_ENGINE=builtin
+      - WEB_CONCURRENCY=2
+      - CORS_ORIGINS=${DRSA_TIERMAKER_URL}
+      - APP_BASE_URL=${DRSA_TIERMAKER_URL}
     networks:
       - backend
+      - drsa_tiermaker_backend
+  # Enea Zeolla <enea.zeolla@psi.ch>
+  drsa-tiermaker-db:
+    image: postgres:16-alpine
+    container_name: drsa-tiermaker-db
+    restart: always
+    environment:
+      - POSTGRES_USER=${DRSA_TIERMAKER_DB_USER}
+      - POSTGRES_PASSWORD=${DRSA_TIERMAKER_DB_PW}
+      - POSTGRES_DB=drsa_tiermaker
+    volumes:
+      - /opt/webcontent/drsa-tiermaker/db-data:/var/lib/postgresql/data
+    healthcheck:
+      test:
+        [
+          "CMD-SHELL",
+          "pg_isready -U ${DRSA_TIERMAKER_DB_USER} -d drsa_tiermaker",
+        ]
+      interval: 10s
+      timeout: 5s
+      retries: 5
+      start_period: 30s
+    networks:
+      - drsa_tiermaker_backend
 
   # PEPISCO <andras.boedi@psi.ch> <patrick.hemberger@psi.ch>
   # PhotoElectron PhotoIon Spectral COmpendium