diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index 4b29291..6f6b228 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -28,6 +28,11 @@ jobs:
           docker build -f Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest .
           docker push git.hamburg.ccc.de/ccchh/sunders/web:latest
       
+      - name: Build and push data_handler image to Container Registry
+        run: |
+          docker build -f Containerfile.data_handler -t git.hamburg.ccc.de/ccchh/sunders/data_handler:latest .
+          docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
+      
       - name: Start Docker Compose services
         run: |
           docker compose up -d --wait
diff --git a/docker-compose.yml b/docker-compose.yml
index 378591b..53b7b72 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -13,6 +13,7 @@ services:
       test: ["CMD", "mariadb-admin", "ping", "-h", "localhost", "-uroot", "-prootpassword"]
       interval: 10s
       timeout: 5s
+      start_period: 30s
       retries: 5
 
   web:
@@ -20,8 +21,8 @@ services:
     environment:
       MYSQL_HOST: db
       MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
-      MYSQL_USER: camera # ${{secrets.MYSQL_USER}}
-      MYSQL_PASSWORD: camerapassword # ${{secrets.MYSQL_PASSWORD}}
+      MYSQL_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
+      MYSQL_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
       DEFAULT_ZOOM: 12
       DEFAULT_LAT: 0
       DEFAULT_LON: 0
@@ -29,4 +30,21 @@ services:
     ports:
       - "8080:80"
     depends_on:
-      - db
\ No newline at end of file
+      data_handler:
+        condition: service_started
+  
+  data_handler:
+    image: git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
+    environment:
+      MYSQL_HOST: db
+      MYSQL_DB: camera # ${{secrets.MYSQL_DATABASE}}
+      MYSQL_USER: root # ${{secrets.MYSQL_USER}}
+      MYSQL_PASSWORD: rootpassword # ${{secrets.MYSQL_ROOT_PASSWORD}}
+      CAMERA_USER: camera # ${{secrets.CAMERA_USER}}
+      CAMERA_USER_PASSWORD: camerapassword # ${{secrets.CAMERA_USER_PASSWORD}}
+      CAMERA_SELECT_USER: camera_select # ${{secrets.CAMERA_SELECT_USER}}
+      CAMERA_SELECT_USER_PASSWORD: camera_selectpassword # ${{secrets.CAMERA_SELECT_USER_PASSWORD}}
+    depends_on:
+      db:
+        condition: service_healthy
+        restart: true