diff --git a/.github/workflows/build-and-release.yml b/.github/workflows/build-and-release.yml
index 7894728..413045e 100644
--- a/.github/workflows/build-and-release.yml
+++ b/.github/workflows/build-and-release.yml
@@ -71,6 +71,7 @@ jobs:
         run: bats bats/xfs.bats
 
   release:
+    if: ${{ github.ref_name == github.event.repository.default_branch }}  # Only release from the default branch
     runs-on: ubuntu-latest
     name: Release 🚀
     needs:
@@ -100,10 +101,17 @@ jobs:
         uses: softprops/action-gh-release@v2
         with:
           tag_name: ${{ steps.version.outputs.v-version }}
-          prerelease: true
-          draft: true
+          prerelease: false
+          draft: false
           token: ${{ secrets.GITHUB_TOKEN }}
           generate_release_notes: true
           files: |
             ebs-bootstrap-linux-*
 
+      - id: push-short-tag
+        name: Create release short tag 🏷
+        uses: richardsimko/update-tag@v1.0.11
+        with:
+          tag_name: ${{ steps.version.outputs.major-v-version }}
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}