diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index bcf2d102..cb50ae23 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -30,25 +30,6 @@ jobs:
         mkdir -p config
         pytest
 
-  create-tag:
-    runs-on: ubuntu-latest
-    if: >
-      github.event.pull_request.merged == true &&
-      github.event.pull_request.base.ref == 'main'
-    needs: [test]
-    steps:
-      -
-        name: Checkout
-        uses: actions/checkout@v3
-      -
-        name: Create tag
-        run: |
-          git checkout main
-          git config --global user.name "GitHub Action"
-          git config --global user.email "
-          git tag ${{ github.event.pull_request.title }}
-          git push --tags
-
   build-webui:
     runs-on: ubuntu-latest
     needs: [test]
@@ -91,6 +72,16 @@ jobs:
         working-directory: ./backend/src
         run: |
           echo "VERSION = '$GITHUB_REF_NAME'" > module/__version__.py
+
+      - name: Create Tag
+        if: ${{ github.pull_request.merged == true }}
+        id: create-tag
+        run: |
+          git config --local user.email "
+          git config --local user.name "github-actions"
+          git tag -a ${{ github.event.pull_request.title }} -m ${{ github.event.pull_request.body }}
+          git push origin ${{ github.event.pull_request.title }}
+
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -156,7 +147,7 @@ jobs:
 
   release:
     runs-on: ubuntu-latest
-    needs: [ create-tag, build-docker ]
+    needs: [ build-docker ]
     steps:
 
       - name: Checkout code