diff --git a/.github/workflows/create-release.yaml b/.github/workflows/create-release.yaml
index 230002d6..e8950202 100644
--- a/.github/workflows/create-release.yaml
+++ b/.github/workflows/create-release.yaml
@@ -71,6 +71,11 @@ jobs:
           fetch-depth: 0
           ref: ${{ github.ref_name }}
 
+      - name: Create lightweight tag
+        run: |
+          git tag ${{ github.event.inputs.name }}
+          git push origin ${{ github.event.inputs.name }}
+
       - name: Create draft release
         id: create-draft
         env:
@@ -79,11 +84,6 @@ jobs:
           RELEASE_ID=$(./.github/scripts/release-draft.sh ${{ github.event.inputs.name }})
           echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT
 
-      - name: Create lightweight tag
-        run: |
-          git tag ${{ github.event.inputs.name }}
-          git push origin ${{ github.event.inputs.name }}
-
       - name: Create release assets
         id: create-assets
         env:
diff --git a/module-config-template.yaml b/module-config-template.yaml
index 2059a32f..a2f54f0e 100644
--- a/module-config-template.yaml
+++ b/module-config-template.yaml
@@ -3,5 +3,4 @@ channel: <this-will-be-autofilled>
 version: <this-will-be-autofilled>
 manifest: warden.yaml
 moduleRepo: https://github.com/kyma-project/warden.git
-moduleRepoTag: <this-will-be-autofilled>
 mandatory: true
\ No newline at end of file