diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 000000000..447de9252
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,65 @@
+name: Antigravity CLI - Bug Report
+description: File a bug report for the Antigravity CLI
+title: "[Bug]: "
+labels: ["bug"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]
+        > Thanks for taking the time to fill out this bug report!
+        > Please search **[existing issues](https://github.com/google-antigravity/antigravity-cli/issues)** before creating a new report.
+
+  - type: input
+    id: version
+    attributes:
+      label: Antigravity CLI Version
+      description: What version of agy are you using? (Run `agy --version`)
+      placeholder: e.g. 1.1.5
+    validations:
+      required: true
+
+  - type: dropdown
+    id: os
+    attributes:
+      label: Operating System
+      description: What OS are you running on?
+      options:
+        - Linux (Ubuntu/Debian/Fedora/Arch)
+        - macOS (Apple Silicon / arm64)
+        - macOS (Intel / x64)
+        - Windows 10/11 (PowerShell / CMD)
+        - Windows WSL2
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug Description
+      description: A clear and concise description of what the bug is.
+      placeholder: Describe what happened...
+    validations:
+      required: true
+
+  - type: textarea
+    id: reproduction
+    attributes:
+      label: Steps to Reproduce
+      description: How can maintainers reproduce the issue?
+      placeholder: |
+        1. Run command '...'
+        2. Execute step '...'
+        3. See error
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Logs or Console Output
+      description: Paste relevant terminal output or log snippets.
+      render: shell
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..09934a38d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Google AI Developer Forum
+    url: https://discuss.ai.google.dev/
+    about: Ask questions and discuss Antigravity CLI with the community
+  - name: Antigravity CLI Documentation
+    url: https://antigravity.google/docs/cli/overview
+    about: Read official manuals and documentation
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 000000000..9153774b1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,37 @@
+name: Antigravity CLI - Feature Request
+description: Propose a new feature or improvement for Antigravity CLI
+title: "[Feature Request]: "
+labels: ["type: feature request"]
+assignees: []
+body:
+  - type: markdown
+    attributes:
+      value: |
+        > [!IMPORTANT]
+        > Thanks for taking the time to suggest a feature request!
+        > Please search **[existing issues](https://github.com/google-antigravity/antigravity-cli/issues)** to see if a similar feature has already been requested.
+
+  - type: textarea
+    id: feature-description
+    attributes:
+      label: Feature Description
+      description: What feature or enhancement would you like to see?
+      placeholder: Describe the feature clearly...
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-case
+    attributes:
+      label: Use Case / Rationale
+      description: What problem does this solve for your workflow?
+    validations:
+      required: true
+
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Alternatives Considered
+      description: Any alternative solutions or workarounds you have considered?
+    validations:
+      required: false