diff --git a/.forgejo/workflows/images.yml b/.forgejo/workflows/images.yml
index 6bc1c1a..7c71f84 100644
--- a/.forgejo/workflows/images.yml
+++ b/.forgejo/workflows/images.yml
@@ -23,18 +23,31 @@ jobs:
           username: ${{ secrets.REGISTRY_USERNAME }}
           password: ${{ secrets.REGISTRY_TOKEN }}
       
+      - name: Set image tag
+        id: vars
+        run: |
+          if [ "${{ github.ref_name }}" = "main" ]; then
+            echo "tag=latest" >> $GITHUB_OUTPUT
+          else
+            echo "tag=${{ github.ref_name }}" >> $GITHUB_OUTPUT
+          fi
+
       - name: Build and push web image to Container Registry
         run: |
-          docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:latest .
-          docker push git.hamburg.ccc.de/ccchh/sunders/web:latest
+          docker build -f ./Containerfile -t git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }} .
+          docker push git.hamburg.ccc.de/ccchh/sunders/web:${{ steps.vars.outputs.tag }}
         working-directory: ./web
-      
+
       - name: Build and push data_handler image to Container Registry
         run: |
-          docker build -f ./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/data_handler:${{ steps.vars.outputs.tag }} .
+          docker push git.hamburg.ccc.de/ccchh/sunders/data_handler:${{ steps.vars.outputs.tag }}
         working-directory: ./data_handler
-      
+
+      - 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