diff --git a/.github/ISSUE_TEMPLATE/cloud-mcp-bug-report.yml b/.github/ISSUE_TEMPLATE/cloud-mcp-bug-report.yml
new file mode 100644
index 000000000..758ad4efb
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cloud-mcp-bug-report.yml
@@ -0,0 +1,15 @@
+name: Cloud MCP bug report
+description: Report a bug in the Airbyte Cloud MCP server.
+labels: [airbyte-mcp-beta, bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Don't paste API keys, client secrets, passwords, or connector credentials into this issue. GitHub issues in this repository are public.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: What happened, what you expected, and the steps or tool calls that led to it.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/cloud-mcp-feature-request.yml b/.github/ISSUE_TEMPLATE/cloud-mcp-feature-request.yml
new file mode 100644
index 000000000..7a8f37450
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/cloud-mcp-feature-request.yml
@@ -0,0 +1,15 @@
+name: Cloud MCP feature request
+description: Request a feature for the Airbyte Cloud MCP server.
+labels: [airbyte-mcp-beta, enhancement]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Don't paste API keys, client secrets, passwords, or connector credentials into this issue. GitHub issues in this repository are public.
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: The problem you want solved and the feature you're proposing.
+    validations:
+      required: true