diff --git a/.github/ISSUE_TEMPLATE/---bug-report.md b/.github/ISSUE_TEMPLATE/---bug-report.md
index 17d8c6870..560c7d9df 100644
--- a/.github/ISSUE_TEMPLATE/---bug-report.md
+++ b/.github/ISSUE_TEMPLATE/---bug-report.md
@@ -1,9 +1,10 @@
 ---
 name: "\U0001F41E Bug report"
 about: Create a report to help us improve
-title: ""
-labels: bug
-assignees: ""
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
 **Describe the bug**
diff --git a/.github/ISSUE_TEMPLATE/---feature-request.md b/.github/ISSUE_TEMPLATE/---feature-request.md
index 8150e01b8..9d89858cc 100644
--- a/.github/ISSUE_TEMPLATE/---feature-request.md
+++ b/.github/ISSUE_TEMPLATE/---feature-request.md
@@ -1,9 +1,10 @@
 ---
 name: "\U0001F914 Feature request"
 about: Please use discussions instead of issues for feature requests
-title: ""
-labels: ""
-assignees: ""
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
 **DO NOT OPEN AN ISSUE FOR FEATURE REQUESTS**
diff --git a/.github/ISSUE_TEMPLATE/🛠️-self-hosting-issue.md b/.github/ISSUE_TEMPLATE/🛠️-self-hosting-issue.md
new file mode 100644
index 000000000..d5100c83b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/🛠️-self-hosting-issue.md
@@ -0,0 +1,48 @@
+---
+name: "\U0001F6E0️ Self-Hosting Issue"
+about: Report an issue with your self-hosted Rallly instance
+title: ''
+labels: "\U0001F6E0️ self-hosted"
+assignees: ''
+
+---
+
+**1. Describe the Issue**
+
+A clear and concise description of what the issue is.
+
+**2. To Reproduce**
+
+How did you encounter the issue? Provide clear reproducible steps if possible.
+
+**3. Expected Behavior**
+
+A clear and concise description of what you expected to happen.
+
+**4. Actual Behavior**
+
+A clear and concise description of what actually happened. If an error message was displayed, please include the full text.
+
+**5. Screenshots or Error Logs**
+
+If applicable, add screenshots to help explain your problem.
+
+**For server-side errors or database migration issues, please provide relevant logs:**
+   - **Application Logs:** (e.g., Docker container logs for Rallly)
+   - **Database Logs:** (e.g., PostgreSQL logs showing the error, especially for migration failures)
+
+**6. Environment (please complete the following information):**
+
+*   **Rallly Version:** [e.g., v4.0.0, or "Upgrading from v3.11.2 to v4.0.0"]
+*   **Deployment Method:** [e.g., Official Docker Image, Built from Source, etc.]
+*   **Operating System (hosting Rallly):** [e.g., Ubuntu 22.04, Windows Server 2019, Synology DSM]
+*   **Database Type & Version:** [e.g., PostgreSQL 14.5]
+*   **Reverse Proxy (if any):** [e.g., Nginx, Caddy, Traefik, None]
+*   **Browser (if UI issue):** [e.g., Chrome 110, Firefox 109]
+
+**7. Additional Context**
+
+Add any other context about the problem here. For example:
+*   Did this start happening after an upgrade?
+*   Is it intermittent or always reproducible?
+*   Are you using any custom configurations?