diff --git a/.gitea/workflows/build dev.yaml b/.gitea/workflows/build dev.yaml
index b7aab73..329a854 100644
--- a/.gitea/workflows/build dev.yaml	
+++ b/.gitea/workflows/build dev.yaml	
@@ -17,7 +17,7 @@ jobs:
 
       - name: Get Date and Build Number
         run: |
-          git fetch
+          git fetch --tags
           git tag
           DATE=$(date +'%Y.%m.%d')
           TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
@@ -59,7 +59,7 @@ jobs:
       - name: Build docker
         run: |
           cd api
-          echo "VERSION = \"$(cat version.txt)\"" > version.py
+          echo "VERSION = \"$(cat ../version.txt)\"" > version.py
           docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) .
 
       - name: Login to registry git.sh-edraft.de
@@ -71,7 +71,7 @@ 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:$(cat ../version.txt)
 
   build-redirector:
     runs-on: [runner]
@@ -103,7 +103,7 @@ 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:$(cat ../version.txt)
 
   build-web:
     runs-on: [runner]
@@ -134,7 +134,7 @@ jobs:
       - name: Build docker
         run: |
           cd web
-          docker build --no-cache --build-arg VERSION=$(cat version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
+          docker build --no-cache --build-arg VERSION=$(cat ../version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -145,4 +145,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:$(cat ../version.txt)
diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 5990a07..3261326 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -17,7 +17,7 @@ jobs:
 
       - name: Get Date and Build Number
         run: |
-          git fetch
+          git fetch --tags
           git tag
           DATE=$(date +'%Y.%m.%d')
           TAG_COUNT=$(git tag -l "${DATE}.*" | wc -l)
@@ -58,7 +58,7 @@ jobs:
       - name: Build docker
         run: |
           cd api
-          echo "VERSION = \"$(cat version.txt)\"" > version.py
+          echo "VERSION = \"$(cat ../version.txt)\"" > version.py
           docker build --no-cache -t git.sh-edraft.de/sh-edraft.de/open-redirect-api:$(cat ../version.txt) .
 
       - name: Login to registry git.sh-edraft.de
@@ -70,7 +70,7 @@ 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:$(cat ../version.txt)
 
   build-redirector:
     runs-on: [runner]
@@ -102,7 +102,7 @@ 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:$(cat ../version.txt)
 
   build-web:
     runs-on: [runner]
@@ -133,7 +133,7 @@ jobs:
       - name: Build docker
         run: |
           cd web
-          docker build --no-cache --build-arg VERSION=$(cat version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
+          docker build --no-cache --build-arg VERSION=$(cat ../version.txt) -t git.sh-edraft.de/sh-edraft.de/open-redirect-web:$(cat ../version.txt) .
 
       - name: Login to registry git.sh-edraft.de
         uses: https://github.com/docker/login-action@v1
@@ -144,4 +144,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:$(cat ../version.txt)