diff --git a/.gitea/workflows/build.yml b/.gitea/workflows/build.yml
index 85e3da1..891abc3 100644
--- a/.gitea/workflows/build.yml
+++ b/.gitea/workflows/build.yml
@@ -70,14 +70,18 @@ jobs:
           name: jar-artifact
           path: build/libs
 
+      - name: Set up Docker Image Tag
+        id: docker_tag
+        run: echo "DOCKER_IMAGE_TAG=$(echo ${{ github.ref }} | sed 's#refs/tags/v##')" >> $GITHUB_ENV
+
       - name: Build Docker Image
-        run: docker build . -t walzen665/sharepulse:latest
+        run: docker build . -t walzen665/sharepulse:${{ env.DOCKER_IMAGE_TAG }}
 
       - name: Tag Docker image
-        run: docker tag walzen665/sharepulse:latest git.walzen665.de/walzen665/sharepulse:latest
+        run: docker tag walzen665/sharepulse:latest git.walzen665.de/walzen665/sharepulse:${{ env.DOCKER_IMAGE_TAG }}
 
       - name: Log in to Gitea Docker Registry
         run: echo ${{ secrets.GITEAREGISTRYTOKEN }} | docker login -u ${{ secrets.GITEAREGISTRYUSERNAME }} --password-stdin https://git.walzen665.de
 
       - name: Push Docker Image to Gitea
-        run: docker push git.walzen665.de/walzen665/sharepulse:latest
\ No newline at end of file
+        run: docker push git.walzen665.de/walzen665/sharepulse:${{ env.DOCKER_IMAGE_TAG }}
\ No newline at end of file