diff --git a/.gitea/workflows/build dev.yaml b/.gitea/workflows/build dev.yaml
index 1ab0ca0..5a3f7ee 100644
--- a/.gitea/workflows/build dev.yaml	
+++ b/.gitea/workflows/build dev.yaml	
@@ -1,13 +1,46 @@
-name: Build dev on push
-run-name: Build dev on push
+name: Build on push
+run-name: Build on push
 on:
   push:
     branches:
       - dev
 
 jobs:
+  prepare:
+    runs-on: [runner]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    outputs:
+      build_version: ${{ steps.get_version.outputs.build_version }}
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Get Date and Build Number
+        run: |
+          DATE=$(date +'%Y.%m.%d')
+          git fetch --tags
+          TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
+          BUILD_NUMBER=$(($TAG_COUNT + 1))
+          BUILD_VERSION="${DATE}.${BUILD_NUMBER}-dev"
+          echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+          echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV
+
+      - name: Create Git Tag for Build
+        run: |
+          git config user.name "ci"
+          git config user.email "dev@sh-edratf.de"
+          git tag ${{ env.BUILD_VERSION }}
+          git push origin ${{ env.BUILD_VERSION }}
+
+      - name: Save Version Info
+        run: |
+          echo "VERSION = \"${{ env.BUILD_VERSION }}\"" > api/version.py
+
   build-api:
     runs-on: [runner]
+    needs: prepare
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Clone Repository
@@ -18,7 +51,7 @@ jobs:
       - name: Build docker
         run: |
           cd api
-          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api-dev:$(cat ../version.txt) .
+          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:${{ needs.prepare.outputs.build_version }} .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -29,10 +62,11 @@ jobs:
 
       - name: Push image
         run: |
-          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api-dev:$(cat version.txt)
-  
+          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:${{ needs.prepare.outputs.build_version }}
+
   build-redirector:
     runs-on: [runner]
+    needs: prepare
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Clone Repository
@@ -43,7 +77,7 @@ jobs:
       - name: Build docker
         run: |
           cd api
-          docker build -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector-dev:$(cat ../version.txt) .
+          docker build -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:${{ needs.prepare.outputs.build_version }} .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -54,10 +88,11 @@ jobs:
 
       - name: Push image
         run: |
-          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector-dev:$(cat version.txt)
+          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:${{ needs.prepare.outputs.build_version }}
 
   build-web:
     runs-on: [runner]
+    needs: prepare
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Clone Repository
@@ -78,7 +113,7 @@ jobs:
       - name: Build docker
         run: |
           cd web
-          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web-dev:$(cat ../version.txt) .
+          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:${{ needs.prepare.outputs.build_version }} .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -89,4 +124,4 @@ jobs:
 
       - name: Push image
         run: |
-          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web-dev:$(cat version.txt)
+          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:${{ needs.prepare.outputs.build_version }}
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 1d48b26..f898529 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -6,8 +6,41 @@ on:
       - master
 
 jobs:
+  prepare:
+    runs-on: [runner]
+    container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
+    outputs:
+      build_version: ${{ steps.prepare.outputs.build_version }}
+    steps:
+      - name: Clone Repository
+        uses: https://github.com/actions/checkout@v3
+        with:
+          token: ${{ secrets.CI_ACCESS_TOKEN }}
+
+      - name: Get Date and Build Number
+        run: |
+          DATE=$(date +'%Y.%m.%d')
+          git fetch --tags
+          TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
+          BUILD_NUMBER=$(($TAG_COUNT + 1))
+          BUILD_VERSION="${DATE}.${BUILD_NUMBER}"
+          echo "build_version=$BUILD_VERSION" >> $GITHUB_OUTPUT
+          echo "BUILD_VERSION=$BUILD_VERSION" >> $GITHUB_ENV
+
+      - name: Create Git Tag for Build
+        run: |
+          git config user.name "ci"
+          git config user.email "dev@sh-edratf.de"
+          git tag ${{ env.BUILD_VERSION }}
+          git push origin ${{ env.BUILD_VERSION }}
+
+      - name: Save Version Info
+        run: |
+          echo "VERSION = \"${{ env.BUILD_VERSION }}\"" > api/version.py
+
   build-api:
     runs-on: [runner]
+    needs: [prepare]
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Clone Repository
@@ -18,7 +51,7 @@ jobs:
       - name: Build docker
         run: |
           cd api
-          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) .
+          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:${{ needs.prepare.outputs.build_version }} .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -29,10 +62,11 @@ jobs:
 
       - name: Push image
         run: |
-          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat version.txt)
-  
+          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-api:${{ needs.prepare.outputs.build_version }}
+
   build-redirector:
     runs-on: [runner]
+    needs: [prepare]
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Clone Repository
@@ -43,7 +77,7 @@ jobs:
       - name: Build docker
         run: |
           cd api
-          docker build -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat ../version.txt) .
+          docker build -f dockerfile_redirector -t git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:${{ needs.prepare.outputs.build_version }} .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -54,10 +88,11 @@ jobs:
 
       - name: Push image
         run: |
-          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:$(cat version.txt)
+          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-redirector:${{ needs.prepare.outputs.build_version }}
 
   build-web:
     runs-on: [runner]
+    needs: [prepare]
     container: git.sh-edraft.de/sh-edraft.de/act-runner:latest
     steps:
       - name: Clone Repository
@@ -78,7 +113,7 @@ jobs:
       - name: Build docker
         run: |
           cd web
-          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
+          docker build -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:${{ needs.prepare.outputs.build_version }} .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -89,4 +124,4 @@ jobs:
 
       - name: Push image
         run: |
-          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat version.txt)
+          docker push git.sh-edraft.de/sh-edraft.de/open-redirect-web:${{ needs.prepare.outputs.build_version }}
diff --git a/version.txt b/version.txt
deleted file mode 100644
index cb174d5..0000000
--- a/version.txt
+++ /dev/null
@@ -1 +0,0 @@
-1.2.1
\ No newline at end of file