diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
index bb47b47f..bbc1e098 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -1,7 +1,7 @@
 ---
 name: Bug report
 about: Create a report to help us improve
-title: "[BUG]"
+title: "[Bug] "
 labels: bug
 assignees: ''
 
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
index b01699b7..6760afa8 100644
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -1,7 +1,7 @@
 ---
 name: Feature request
 about: Suggest an idea for this project
-title: "[Feat]"
+title: "[Feat] "
 labels: ''
 assignees: ''
 
diff --git a/.github/ISSUE_TEMPLATE/self_host_issue.md b/.github/ISSUE_TEMPLATE/self_host_issue.md
new file mode 100644
index 00000000..73a0ef9d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/self_host_issue.md
@@ -0,0 +1,40 @@
+---
+name: Self-host issue
+about: Report an issue with self-hosting Firecrawl
+title: "[Self-Host] "
+labels: self-host
+assignees: ''
+
+---
+
+**Describe the Issue**
+Provide a clear and concise description of the self-hosting issue you're experiencing.
+
+**To Reproduce**
+Steps to reproduce the issue:
+1. Configure the environment or settings with '...'
+2. Run the command '...'
+3. Observe the error or unexpected output at '...'
+4. Log output/error message
+
+**Expected Behavior**
+A clear and concise description of what you expected to happen when self-hosting.
+
+**Screenshots**
+If applicable, add screenshots or copies of the command line output to help explain the self-hosting issue.
+
+**Environment (please complete the following information):**
+- OS: [e.g. macOS, Linux, Windows]
+- Firecrawl Version: [e.g. 1.2.3]
+- Node.js Version: [e.g. 14.x]
+- Docker Version (if applicable): [e.g. 20.10.14]
+- Database Type and Version: [e.g. PostgreSQL 13.4]
+
+**Logs**
+If applicable, include detailed logs to help understand the self-hosting problem.
+
+**Configuration**
+Provide relevant parts of your configuration files (with sensitive information redacted).
+
+**Additional Context**
+Add any other context about the self-hosting issue here, such as specific infrastructure details, network setup, or any modifications made to the original Firecrawl setup.