diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
new file mode 100644
index 0000000..7dd7268
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,42 @@
+---
+name: Bug Report
+about: Report a bug or issue with the proxy
+title: '[BUG] '
+labels: bug
+assignees: ''
+---
+
+**Bug Description**
+A clear and concise description of the bug.
+
+**Steps to Reproduce**
+1.
+2.
+3.
+
+**Expected Behavior**
+What should happen.
+
+**Actual Behavior**
+What actually happens.
+
+**Environment**
+- Claude Code version:
+- antigravity-claude-proxy version:
+- Operating System:
+- Node.js version:
+
+**Logs (if applicable)**
+
+
+**Checklist**
+Please confirm:
+- [ ] I've updated antigravity-claude-proxy to the latest version
+- [ ] The bug exists in the latest version
+- [ ] I'm using this proxy for personal development only
+- [ ] I have an active Google Cloud project with Antigravity enabled
+- [ ] This issue is not related to attempting commercial use or TOS violations
+- [ ] I've reviewed the README troubleshooting section
+
+**Additional Context**
+Add any other relevant information.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..5161d4f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,11 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Google Cloud Support
+    url: https://cloud.google.com/support
+    about: For Google Cloud account or billing issues, contact Google Cloud directly
+  - name: Google Terms of Service
+    url: https://policies.google.com/terms
+    about: Review Google's Terms of Service for compliance questions
+  - name: Discussions
+    url: https://github.com/badrisnarayanan/antigravity-claude-proxy/discussions
+    about: Ask questions or discuss the proxy with the community
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 0000000..ccd976f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,28 @@
+---
+name: Feature Request
+about: Suggest a new feature or enhancement
+title: '[FEATURE] '
+labels: enhancement
+assignees: ''
+---
+
+**Feature Description**
+A clear description of the feature you'd like to see.
+
+**Use Case**
+Explain how this feature would be used and what problem it solves.
+
+**Proposed Implementation**
+If you have ideas about how this could be implemented, share them here.
+
+**Compliance Consideration**
+Please confirm:
+- [ ] This feature is for personal development use
+- [ ] This feature does not violate or circumvent Google's Terms of Service
+- [ ] This feature is not intended for commercial resale or multi-user access
+
+**Alternatives Considered**
+Have you considered any alternative solutions or workarounds?
+
+**Additional Context**
+Add any other context, screenshots, or examples.