diff --git a/.github/PULL_REQUEST_TEMPLATE/default_request_template.md b/.github/PULL_REQUEST_TEMPLATE/default_request_template.md
new file mode 100644
index 00000000..9ac4e773
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/default_request_template.md
@@ -0,0 +1,39 @@
+## PR Checklist
+
+Please check if your PR fulfills the following requirements:
+
+<!--- [ ] Tests for the changes have been added (for bug fixes/features)-->
+
+- [ ] Docs have been added/updated (for bug fixes/features)
+
+## PR Type
+
+What kind of change does this PR introduce?
+
+<!-- Please check the one that applies to this PR using "x". -->
+
+- [ ] Bugfix
+- [ ] Feature
+- [ ] Code style update (formatting, local variables)
+- [ ] Refactoring (no functional changes, no API changes)
+- [ ] Build related changes
+- [ ] CI-related changes
+- [ ] Documentation content changes
+- [ ] Other... Please describe:
+
+## Issue Number
+
+<!-- Bugs and features must be linked to an issue. -->
+
+Issue Number: N/A
+
+## Does this PR introduce a breaking change?
+
+<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
+
+- [ ] Yes
+- [ ] No
+
+## Other information
+
+@coderabbitai summary
diff --git a/.github/PULL_REQUEST_TEMPLATE/release_request_template.md b/.github/PULL_REQUEST_TEMPLATE/release_request_template.md
new file mode 100644
index 00000000..67c09517
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE/release_request_template.md
@@ -0,0 +1,15 @@
+## PR Type
+
+What kind of change does this PR introduce?
+
+<!-- Please check the one that applies to this PR using "x". -->
+
+- [x] Release
+
+<!--
+  Please set this as a title and change the version number
+
+  If you don't know the version number, run on the main branch the release GitHub workflow with dryRun enabled
+
+  chore: prepare x.y.z
+-->
\ No newline at end of file
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 9ac4e773..ebe431af 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,39 +1,4 @@
-## PR Checklist
+Please go to the `Preview` tab and select the appropriate sub-template:
 
-Please check if your PR fulfills the following requirements:
-
-<!--- [ ] Tests for the changes have been added (for bug fixes/features)-->
-
-- [ ] Docs have been added/updated (for bug fixes/features)
-
-## PR Type
-
-What kind of change does this PR introduce?
-
-<!-- Please check the one that applies to this PR using "x". -->
-
-- [ ] Bugfix
-- [ ] Feature
-- [ ] Code style update (formatting, local variables)
-- [ ] Refactoring (no functional changes, no API changes)
-- [ ] Build related changes
-- [ ] CI-related changes
-- [ ] Documentation content changes
-- [ ] Other... Please describe:
-
-## Issue Number
-
-<!-- Bugs and features must be linked to an issue. -->
-
-Issue Number: N/A
-
-## Does this PR introduce a breaking change?
-
-<!-- If this PR contains a breaking change, please describe the impact and migration path for existing applications below. -->
-
-- [ ] Yes
-- [ ] No
-
-## Other information
-
-@coderabbitai summary
+* [Default](?expand=1&template=default_request_template.md)
+* [Release](?expand=1&template=release_request_template.md)
\ No newline at end of file
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index fa762ccb..c4774095 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -11,6 +11,7 @@ on:
 
 jobs:
   release:
+    if: (github.event_name == 'workflow_dispatch' && github.ref == 'refs/heads/release') || (github.event_name == 'workflow_dispatch' && github.event.inputs.dryRun == 'true' && github.ref == 'refs/heads/main')
     name: Release new version 🛠
     runs-on: ubuntu-latest
     permissions:
@@ -19,12 +20,6 @@ jobs:
       issues: write
       pull-requests: write
     steps:
-      - name: Fail if branch is not release
-        if: github.event_name == 'workflow_dispatch' && github.ref != 'refs/heads/release'
-        run: |
-          echo "This workflow should not be triggered with workflow_dispatch on a branch other than release"
-          exit 1
-
       - name: Check out the code 🗄
         uses: actions/checkout@v4
         with:
diff --git a/libs/flowbite-angular/project.json b/libs/flowbite-angular/project.json
index 298ef2f3..4037be24 100644
--- a/libs/flowbite-angular/project.json
+++ b/libs/flowbite-angular/project.json
@@ -39,6 +39,7 @@
         "npm": true,
         "changelog": true,
         "branches": [
+          "main",
           "release",
           {
             "name": "beta",