diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000..fff1d85
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,67 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+body:
+  - type: dropdown
+    id: provider
+    attributes:
+      label: Which Provider are you using?
+      multiple: false
+      options:
+        - OpenRouter
+        - Anthropic
+        - Google Gemini
+        - GCP Vertex AI
+        - AWS Bedrock
+        - OpenAI
+        - OpenAI Compatible
+        - Ollama
+    validations:
+      required: true
+  - type: input
+    id: model
+    attributes:
+      label: Which Model are you using?
+      description: Please specify the model you're using (e.g., Claude 3.5 Sonnet, etc.)
+    validations:
+      required: true
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also tell us, what did you expect to happen?
+      placeholder: Tell us what you see!
+    validations:
+      required: true
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps to reproduce
+      description: How do you trigger this bug? Please walk us through it step by step.
+      value: |
+        1.
+        2.
+        3.
+        ...
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant API REQUEST output
+      description: Please copy and paste any relevant output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      description: Add any other context about the problem here, such as screenshots or related issues.
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Before you submit
+      options:
+        - label: I have checked existing issues
+          required: true
+        - label: I am using the latest version of Claude Dev and VS Code
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..9ced45d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Feature Request & Ideas
+    url: https://github.com/saoudrizwan/claude-dev/discussions/categories/ideas
+    about: Share your ideas and feature requests for Claude Dev
+  - name: Claude Dev Discord Community
+    url: https://discord.gg/claudedev
+    about: Join our Discord community for discussions and support
+  - name: Other Questions?
+    url: https://x.com/sdrzn
+    about: Contact the developer on X @sdrzn for other inquiries
\ No newline at end of file
diff --git a/README.md b/README.md
index 82cb187..1ceb3ca 100644
--- a/README.md
+++ b/README.md
@@ -101,7 +101,7 @@ This project is licensed under the MIT License. See the [LICENSE](./LICENSE) fil
 
 ## Questions?
 
-Contact me on X <a href="https://x.com/sdrzn" target="_blank">@sdrzn</a>. Please create an <a href="https://github.com/saoudrizwan/claude-dev/issues">issue</a> if you come across a bug or would like a feature to be added.
+Contact me on X <a href="https://x.com/sdrzn" target="_blank">@sdrzn</a>. Please create an <a href="https://github.com/saoudrizwan/claude-dev/issues">issue</a> if you come across a bug or post an <a href="https://github.com/saoudrizwan/claude-dev/discussions/categories/ideas">idea</a> if you would like a feature to be added.
 
 ## Acknowledgments