diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml
deleted file mode 100644
index c6942ba..0000000
--- a/.gitea/workflows/deploy.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-name: Deploy
-on:
-  push:
-    branches:
-      - "main"
-    paths:
-      - "backend/**"
-  
-jobs:
-  build-image:
-    runs-on: ubuntu-latest
-    name: Build Docker Image
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Build Image
-        run: docker buildx build -f backend/.docker/Dockerfile -t git.kjan.de/szut/casino-backend:latest backend
-      - name: Login
-        uses: docker/login-action@v3
-        with:
-          registry: git.kjan.de
-          username: ${{ secrets.DOCKER_USER }}
-          password: ${{ secrets.DOCKER_PASS }}
-      - name: Push
-        run: docker push git.kjan.de/szut/casino-backend:latest
diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 05e146d..e38a5a7 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -31,3 +31,33 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           GITEA_TOKEN: ${{ secrets.GITEA_TOKEN }}
 
+  build-image:
+    needs: release
+    runs-on: ubuntu-latest
+    name: Build Docker Image
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # Ensure full history is available
+      - name: Extract tag
+        run: |
+          TAG=$(git describe --tags --abbrev=0)
+          echo "TAG=$TAG" >> $GITHUB_ENV
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Login
+        uses: docker/login-action@v3
+        with:
+          registry: git.kjan.de
+          username: ${{ secrets.DOCKER_USER }}
+          password: ${{ secrets.DOCKER_PASS }}
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: backend/
+          file: backend/.docker/Dockerfile
+          push: true
+          tags: |
+            git.kjan.de/szut/casino-backend:latest
+            git.kjan.de/szut/casino-backend:${{ env.TAG }}