diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 06be7202d..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-
-Don't forget to check if there already exists a relevant issue before
-creating a new one.
-
--->
-
-### Issue description
-
-<!--
-Please describe the issue. For support and help please use the IRC
-channel #home-manager at irc.oftc.net or Matrix room
-https://matrix.to/#/#hm:rycee.net instead.
--->
-
-### Meta
-
-#### Maintainer CC
-
-<!--
-Please @ people who are in the `meta.maintainers` list of the
-offending module. If in doubt, check `git blame` for whoever last
-touched something.
--->
-
-#### Technical details
-
-<!--
-Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the
-result.
--->
diff --git a/.github/ISSUE_TEMPLATE/feature-request.md b/.github/ISSUE_TEMPLATE/feature-request.md
new file mode 100644
index 000000000..4d6c2ff57
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-request.md
@@ -0,0 +1,15 @@
+---
+name: Feature request
+about: Ask for a new feature to be added (module, program, etc.)
+title: ''
+labels: feature request
+assignees: nix-community/home-manager
+
+---
+
+<!--
+Note: Please search to see if the feature has already been requested
+-->
+
+### Description
+
diff --git a/.github/ISSUE_TEMPLATE/issue.yaml b/.github/ISSUE_TEMPLATE/issue.yaml
new file mode 100644
index 000000000..1ffab50d4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/issue.yaml
@@ -0,0 +1,45 @@
+name: Bug Report
+description: File a bug/issue
+title: 'bug: '
+labels: [bug, triage]
+
+assignees:
+- nix-community/home-manager
+
+body:
+- type: checkboxes
+  attributes:
+    label: Is there an existing issue for this?
+    description: |
+      Please search to see if an issue already exists for the bug you encountered.
+    options:
+    - label: I have searched the existing issues
+      required: true
+- type: textarea
+  attributes:
+    label: Issue description
+    description: |
+      Please describe the issue.
+
+      For support and help please use the IRC channel #home-manager at irc.oftc.net or
+      Matrix room <https://matrix.to/#/#hm:rycee.net> instead.
+  validations:
+    required: false
+- type: textarea
+  attributes:
+    label: Maintainer CC
+    description: |
+      Please @ people who are in the `meta.maintainers` list of the offending module.
+      If in doubt, check `git blame` for whoever last touched something.
+  validations:
+    required: false
+- type: textarea
+  id: system
+  attributes:
+    label: System information
+    description: |
+      Please run `nix-shell -p nix-info --run "nix-info -m"` and paste the result.
+    render: markdown
+  validations:
+    required: true
+