diff --git a/.gitea/workflows/test_image_build_push.yml b/.gitea/workflows/test_image_build_push.yml
index 1295a5f..749327a 100644
--- a/.gitea/workflows/test_image_build_push.yml
+++ b/.gitea/workflows/test_image_build_push.yml
@@ -4,8 +4,29 @@ on:
   push:
     branches: [test]
 jobs:
+  tag:
+    runs-on: ubuntu-latest
+    outputs:
+      new_version: ${{ steps.new_version.outputs.new_version }}
+    steps:
+    - name: Check out repository code
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+      id: new_version
+      run: |
+        VERSION=$(git describe --tags --abbrev=0)
+        echo ${VERSION}
+        MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
+        MINOR=$(echo ${VERSION} | cut -d "." -f 2)
+        PATCH=$(echo ${VERSION} | cut -d "." -f 3)
+        NEW_PATCH=$(( ${PATCH} + 1))
+        echo ${NEW_PATCH}
+        echo "new_version=$($MAJOR.$MINOR.$NEW_PATCH)" >> $GITHUB_OUTPUT
+        echo ${new_version}
   build:
     runs-on: ubuntu-latest
+    needs: tag
     container:
       image: catthehacker/ubuntu:act-latest
     steps:
@@ -20,27 +41,10 @@ jobs:
           java-version: '17'
       - name: Validate Gradle Wrapper
         uses: gradle/actions/wrapper-validation@v3
-      - name: Get latest tag
-        id: get_tag
-        run: |
-          VERSION=$(git describe --tags --abbrev=0)
-          echo "VERSION=${VERSION}" >> $GITHUB_OUTPUT
-          MAJOR=$(echo ${VERSION} | cut -d "." -f 1)
-          echo "MAJOR=${MAJOR}" >> $GITHUB_OUTPUT
-          MINOR=$(echo ${VERSION} | cut -d "." -f 2)
-          echo "MINOR=${MINOR}" >> $GITHUB_OUTPUT
-          PATCH=$(echo ${VERSION} | cut -d "." -f 3)
-          echo "PATCH=${PATCH}" >> $GITHUB_OUTPUT
-      - name: Increment version
-        id: calc_new_tag
-        run: |
-          echo "${{ steps.get_id.outputs.PATCH }}"
-          echo "NEW_PATCH=$(( ${{ steps.get_id.outputs.PATCH }} + 1))" >> $GITHUB_OUTPUT
-          echo "NEW_VERSION=$( ${{ steps.get_id.outputs.MAJOR }}.${{ steps.get_id.outputs.MINOR }}.${NEW_PATCH})" >> $GITHUB_OUTPUT
       - name: Create and push tag
         run: |
-          git tag -a ${{ steps.calc_new_tag.outputs.NEW_VERSION }} -m "Pushing new version ${{ steps.calc_new_tag.outputs.NEW_VERSION }}"
-          git push origin ${{ steps.calc_new_tag.outputs.NEW_VERSION }}
+          git tag -a ${{ needs.tag.outputs.new_version }} -m "Pushing new version ${{ needs.tag.outputs.new_version }}"
+          git push origin ${{ needs.tag.outputs.new_version }}
       - name: Log in to Gitea Docker Registry
         uses: docker/login-action@v3
         with:
@@ -48,10 +52,10 @@ jobs:
           username: hitanshu
           password: ${{ secrets.TOKEN }}
       - name: Gradle build
-        run: ./gradlew bootBuildImage --imageName=192.168.0.100:8928/hithomelabs/cftunnels:${{ steps.calc_new_tag.outputs.NEW_VERSION }}
+        run: ./gradlew bootBuildImage --imageName=192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}
       - name: Tag image as test
-        run: docker tag 192.168.0.100:8928/hithomelabs/cftunnels:${{ steps.calc_new_tag.outputs.NEW_VERSION }} 192.168.0.100:8928/hithomelabs/cftunnels:test
+        run: docker tag 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }} 192.168.0.100:8928/hithomelabs/cftunnels:test
       - name: Push to Gitea Registry
         run: |
           docker push 192.168.0.100:8928/hithomelabs/cftunnels:test
-          docker push 192.168.0.100:8928/hithomelabs/cftunnels:${{ steps.calc_new_tag.outputs.NEW_VERSION }}
+          docker push 192.168.0.100:8928/hithomelabs/cftunnels:${{ needs.tag.outputs.new_version }}