diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index 5013c928..edcc5922 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,9 +1,12 @@
 ---
 name: Bug report
 about: Report a bug in IdentityLifecycleEngine (IdLE)
-title: "[Bug] "
-labels: bug
-assignees: ""
+title: ""
+labels:
+  - bug
+  - new
+assignees:
+  - blindzero
 ---
 
 ## Description
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..c8958b07
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+  - name: "IdLE Documentation"
+    url: "https://blindzero.github.io/IdentityLifecycleEngine/"
+    about: "Read the official Identity Lifecycle Engine documentation."
+  - name: "Report a bug"
+    url: "https://github.com/blindzero/IdentityLifecycleEngine/issues/new?template=bug_report.md"
+    about: "Create a bug report for Identity Lifecycle Engine."
+  - name: "Report a feature request"
+    url: "https://github.com/blindzero/IdentityLifecycleEngine/issues/new?template=feature_request.md"
+    about: "Create a feature request for Identity Lifecycle Engine."
+  - name: "Any other issue"
+    url: "https://github.com/blindzero/IdentityLifecycleEngine/issues/new?template=other.md"
+    about: "Create an issue for anything else regarding Identity Lifecycle Engine."
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index 6ff504a8..84c07b8a 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,9 +1,12 @@
 ---
 name: Feature request
 about: Suggest an enhancement or new feature for IdLE
-title: "[Feature] "
-labels: enhancement
-assignees: ""
+title: ""
+labels:
+  - enhancement
+  - new
+assignees:
+  - blindzero
 ---
 
 ## Problem Statement
@@ -25,4 +28,4 @@ Describe any alternative solutions you have considered.
 
 ## Additional Context
 
-Add any other context or examples here.
+Add any other context or examples here, attach logs, screenshots, or relevant files.
diff --git a/.github/ISSUE_TEMPLATE/other.md b/.github/ISSUE_TEMPLATE/other.md
new file mode 100644
index 00000000..41589346
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other.md
@@ -0,0 +1,28 @@
+---
+name: "General / Other"
+about: "For issues that don't fit 'Bug report' or 'Feature request'."
+title: ""
+labels:
+  - new
+assignees:
+  - blindzero
+---
+
+---
+> ⚠️ Note — Please use the dedicated templates
+>
+> - Bug report: https://github.com/blindzero/IdentityLifecycleEngine/issues/new?template=bug_report.md
+> - Feature request: https://github.com/blindzero/IdentityLifecycleEngine/issues/new?template=feature_request.md
+---
+
+# Description
+
+Provide a brief, concise summary of your request.
+
+## Attachments
+
+- Attach logs, screenshots, or relevant files.
+
+## Additional notes
+
+Anything else you want to tell...
diff --git a/.github/ISSUE_TEMPLATE/pull_request_template.md b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
similarity index 86%
rename from .github/ISSUE_TEMPLATE/pull_request_template.md
rename to .github/PULL_REQUEST_TEMPLATE/pull_request_template.md
index c598ea6a..af279bc5 100644
--- a/.github/ISSUE_TEMPLATE/pull_request_template.md
+++ b/.github/PULL_REQUEST_TEMPLATE/pull_request_template.md
@@ -1,4 +1,4 @@
-## Summary
+# Summary
 
 Provide a short summary of the changes.
 
@@ -6,12 +6,6 @@ Provide a short summary of the changes.
 
 Why is this change needed? What problem does it solve?
 
-## Changes
-
-- 
-- 
-- 
-
 ## Type of Change
 
 Please select the relevant option:
@@ -22,6 +16,12 @@ Please select the relevant option:
 - [ ] Documentation update
 - [ ] Refactoring / internal improvement
 
+## Changes
+
+- 
+- 
+- 
+
 ## Testing
 
 Describe how this change was tested.
@@ -30,6 +30,10 @@ Describe how this change was tested.
 - [ ] Contract tests
 - [ ] Manual testing
 
+### How to test & review
+
+If helpful, provide additional information how to test.
+
 ## Checklist
 
 - [ ] Code follows STYLEGUIDE.md
@@ -41,3 +45,5 @@ Describe how this change was tested.
 ## Related Issues
 
 Link related issues here (if any).
+
+Closes #...
diff --git a/.github/workflows/issue-auto-assign.yml b/.github/workflows/issue-auto-assign.yml
index e95d301b..6a49bb04 100644
--- a/.github/workflows/issue-auto-assign.yml
+++ b/.github/workflows/issue-auto-assign.yml
@@ -1,9 +1,6 @@
 name: Auto label and assign new issues
 
-on:
-  issues:
-    types: [opened]
-
+on: workflow_dispatch
 jobs:
   label_and_assign:
     if: github.event.issue.user.login != 'blindzero'