diff --git a/.gitea/workflows/dev.yaml b/.gitea/workflows/dev.yaml
index 16e68ac..0105955 100644
--- a/.gitea/workflows/dev.yaml
+++ b/.gitea/workflows/dev.yaml
@@ -1,9 +1,9 @@
-name: docker-monica-build mr
+name: docker-monica-build development
 
 on:
   push:
     branches-ignore:
-      - main
+      - main # Läuft auf allen Branches außer `main`
 
 jobs:
   dockerfile_lint:
@@ -19,12 +19,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      - name: Clean Branch Name
+        id: clean_branch_name
+        run: |
+          CLEANED_BRANCH_NAME=$(echo "${GITHUB_REF_NAME}" | tr '[:upper:]' '[:lower:]' | tr '/_' '-')
+          echo "CLEAN_BRANCH_NAME=${CLEANED_BRANCH_NAME}" >> $GITHUB_ENV
       - name: Kaniko build
-        uses: aevea/action-kaniko@master
+        uses: aevea/action-kaniko@v0.12.0
         with:
           image: rogersik/monica
           registry: gitea.sikorski.cloud
-          tag: "4.1-dev"
+          tag: "${{ env.CLEAN_BRANCH_NAME }}"
           cache: true
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
diff --git a/.gitea/workflows/main.yaml b/.gitea/workflows/main.yaml
index 3a701f0..2745297 100644
--- a/.gitea/workflows/main.yaml
+++ b/.gitea/workflows/main.yaml
@@ -1,11 +1,8 @@
----
 name: docker-monica-build main
 on:
   push:
-    branches:
-      - main
-  schedule:
-    - cron: '0 6 * * SUN'
+    tags:
+      - '[0-9]+.*'
 
 jobs:
   dockerfile_lint:
@@ -21,14 +18,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v4
+      - name: Extract Git Tag
+        id: get_tag
+        run: echo "TAG=${GITHUB_REF_NAME}" >> $GITHUB_ENV
       - name: Kaniko build
-        # https://github.com/aevea/action-kaniko/releases
         uses: aevea/action-kaniko@v0.12.0
         with:
           image: rogersik/monica
           registry: gitea.sikorski.cloud
-          tag: '4.1'
-          # tag_with_latest: true # https://github.com/aevea/action-kaniko/issues/66
+          tag: '${{ env.TAG }}'
           cache: true
+          build_args: |
+            GIT_TAG=${{ env.TAG }}
           username: rogersik
           password: ${{ secrets.REGISTRY_PASSWORD }}
diff --git a/Dockerfile b/Dockerfile
index df12df6..021d5d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # https://hub.docker.com/_/monica
-FROM monica:4.1
+FROM monica:$GIT_TAG
 
 RUN \
   # Use the default production configuration