diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
new file mode 100644
index 0000000..c8a3430
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -0,0 +1,59 @@
+name: Bug report
+description: File a bug report
+labels: [bug, pending triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to file this bug report.
+  - type: textarea
+    attributes:
+      label: Bug description
+      description: A clear and concise description of the bug.
+      placeholder: |
+        <!--
+          What did you do? (Provide reproduction code in next section)
+
+          What did you expect to happen?
+
+          What happened instead?
+
+          Do you have an error stack-trace?
+        -->
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: aicommits version
+      description: |
+        > aicommits --version
+      placeholder: v0.0.0
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Environment
+      description: |
+        Run and paste the output of:
+        ```
+        npx envinfo --system --binaries
+        ```
+        
+        This information is used to for reproduction and debugging.
+      placeholder: |
+        System:
+          OS:
+          CPU:
+          Shell:
+        Binaries:
+          Node:
+          npm:
+      render: shell
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Can you contribute a fix?
+      description: We would love it if you can open a pull request to fix this bug!
+      options:
+        - label: I’m interested in opening a pull request for this issue.
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
new file mode 100644
index 0000000..e8dc9ef
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -0,0 +1,43 @@
+name: Feature request
+description: Suggest an idea for this project
+labels: [feature, pending triage]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for taking the time to file this feature request.
+  - type: textarea
+    attributes:
+      label: Feature request
+      description: A description of the feature you would like.
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Why?
+      description: |
+        Describe the problem you’re tackling with this feature request.
+      placeholder: |
+        <!--
+          What’s the motivation behind this issue?
+
+          eg. “I’m frustrated when...”
+        -->
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Alternatives
+      description: |
+        Have you considered alternative solutions? Is there a workaround?
+      placeholder: |
+        <!--
+          Do you have alternative proposals?
+
+          Do you have a workaround?
+        -->
+  - type: textarea
+    attributes:
+      label: Additional context
+      description: |
+        Anything else to share? Screenshots? Links?
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000..3ba13e0
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false