diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index 2fd7ee6..8c8f5a4 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -1,9 +1,8 @@
-name: Build Hello World Image
+name: Build (and tag) Images
 
 on:
   push:
     branches:
-      - main
     workflow_dispatch:
 
 jobs:
@@ -23,17 +22,36 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
       
-      - name: Build and push web image to Container Registry
+      - name: Set image tags
+        id: vars
         run: |
-          docker build -f ./web/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
+          if [ "${{ github.ref_name }}" = "main" ] && [ "${{ github.event_name }}" = "push" ]; then
+            echo "tag=latest" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build web image
         run: |
-          docker build -f ./data_handler/Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:latest .
-          docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:latest
-      
+          docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} .
+        working-directory: ./web
+
+      - name: Build data_handler image
+        run: |
+          docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }} .
+        working-directory: ./data_handler
+
+      - name: Push images to Container Registry
+        run: |
+          docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }}
+          docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }}
+        if: github.event_name == 'push'
+
+      - name: Update docker-compose.yml image tags
+        run: |
+          sed -i "s/:latest/:${{ steps.vars.outputs.tag }}/g" docker-compose.yml
+
       - name: Start Docker Compose services
         run: |
           docker compose up -d --wait
-          docker compose down
\ No newline at end of file
+          docker compose down 
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 53b7b72..1d60cac 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,4 +1,3 @@
-version: '3.8'
 services:
   db:
     image: mariadb:12.0.2