diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
new file mode 100644
index 00000000000..136d151b9a3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -0,0 +1,34 @@
+name: Bug report
+description: Something in ObjectOS does not work the way it should.
+body:
+  - type: dropdown
+    id: edition
+    attributes:
+      label: Edition
+      description: Which ObjectOS edition did you see this in?
+      options:
+        - ObjectOS Community (self-hosted, this repository's code)
+        - ObjectOS Cloud (cloud.objectos.ai)
+        - ObjectOS Enterprise (licensed, self-managed)
+        - Not sure
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: The output of `os --version`, or the build shown under About in the Console's help menu.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened / What you expected
+      description: What you saw, and what you expected to see instead. Paste error messages as text.
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps
+      description: The steps that make it happen, starting from a fresh start if you can.
+      placeholder: |
+        1.
+        2.
+        3.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..de1231eb8ae
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: Documentation
+    url: https://objectstack.ai/docs
+    about: The published documentation site. Check it before you file an issue.
diff --git a/.github/ISSUE_TEMPLATE/feature-request.yml b/.github/ISSUE_TEMPLATE/feature-request.yml
new file mode 100644
index 00000000000..d332ec90f3f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.yml
@@ -0,0 +1,34 @@
+name: Feature request
+description: Something ObjectOS should do that it does not do today.
+body:
+  - type: dropdown
+    id: edition
+    attributes:
+      label: Edition
+      description: Which ObjectOS edition do you want this in?
+      options:
+        - ObjectOS Community (self-hosted, this repository's code)
+        - ObjectOS Cloud (cloud.objectos.ai)
+        - ObjectOS Enterprise (licensed, self-managed)
+        - Not sure
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: The output of `os --version`, or the build shown under About in the Console's help menu.
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened / What you expected
+      description: What ObjectOS does today, and what you expected it to do instead.
+  - type: textarea
+    id: steps
+    attributes:
+      label: Steps
+      description: The steps that take you to the place where the feature is missing.
+      placeholder: |
+        1.
+        2.
+        3.
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 70cddd0bdef..05ec5d69597 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -313,6 +313,12 @@ verified it.
   and feature requests
 - **[Documentation](https://objectstack.ai/docs)** — the published docs site
 
+This repository is the one public issue tracker for every ObjectOS edition: Community
+(the code in this repository), Cloud and Enterprise. Say which edition you run when you
+open an issue; the Bug report and Feature request forms ask for it. Cloud and Enterprise
+reports are triaged by the ObjectOS Cloud team and may be moved to the repository where
+that code lives.
+
 ## License
 
 By contributing, you agree that your contributions will be licensed under the