diff --git a/docs/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE/1-bug_report.md
similarity index 73%
rename from docs/ISSUE_TEMPLATE.md
rename to .github/ISSUE_TEMPLATE/1-bug_report.md
index 1f9b80068..57ccd493b 100644
--- a/docs/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE/1-bug_report.md
@@ -1,18 +1,29 @@
-# Description
-Is this reporting a bug or feature request?
+---
+name: Bug report
+about: Report a bug or unexpected behavior
+title: ''
+labels: bug
+assignees: ''
+---
 
+## Description
+
+Is this reporting a bug or feature request?
 
 If reporting a bug, please fill out the following:
 
 ### Environment
+
 - pipecat-ai version:
 - python version:
 - OS:
 
 ### Issue description
+
 Provide a clear description of the issue.
 
 ### Repro steps
+
 List the steps to reproduce the issue.
 
 ### Expected behavior
diff --git a/.github/ISSUE_TEMPLATE/2-question.md b/.github/ISSUE_TEMPLATE/2-question.md
new file mode 100644
index 000000000..ff0913903
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/2-question.md
@@ -0,0 +1,25 @@
+---
+name: Question
+about: Ask a question or get help
+title: ''
+labels: question
+assignees: ''
+---
+
+## Environment (if applicable)
+
+- pipecat-ai version:
+- python version:
+- OS:
+
+## Question
+
+Provide your question in detail here.
+
+## What I've tried
+
+Describe what you've already tried or research you've done.
+
+## Context
+
+Any additional context or information that might help others understand your question better.
diff --git a/.github/ISSUE_TEMPLATE/3-feature_request.md b/.github/ISSUE_TEMPLATE/3-feature_request.md
new file mode 100644
index 000000000..fff5404bb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/3-feature_request.md
@@ -0,0 +1,28 @@
+---
+name: Feature request
+about: Suggest an enhancement or new feature
+title: ''
+labels: enhancement
+assignees: ''
+---
+
+## Problem Statement
+
+A clear description of the problem this feature would solve. For example: "I'm always frustrated when..."
+
+## Proposed Solution
+
+A clear and concise description of what you want to happen.
+
+## Alternative Solutions
+
+Any alternative solutions or features you've considered.
+
+## Additional Context
+
+Add any other context, mockups, or screenshots about the feature request here.
+
+## Would you be willing to help implement this feature?
+
+- [ ] Yes, I'd like to contribute
+- [ ] No, I'm just suggesting
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..824f5a0da
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Documentation
+    url: https://docs.pipecat.ai/getting-started/overview
+    about: Please check our documentation before creating an issue.
+  - name: Discord
+    url: https://discord.gg/pipecat
+    about: You can ask questions and get help in our Discord community.
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
similarity index 100%
rename from docs/PULL_REQUEST_TEMPLATE.md
rename to .github/PULL_REQUEST_TEMPLATE.md