diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 0c2416c52..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
-
----
-
-**What did you do?**
-
-**What did you expect?**
-
-**What happened instead?**
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 000000000..fab4da82c
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,19 @@
+name: Bug report
+description: Report a bug
+labels: [bug]
+body:
+- type: textarea
+  attributes:
+    label: What did you do?
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: What did you expect?
+  validations:
+    required: true
+- type: textarea
+  attributes:
+    label: What happened instead?
+  validations:
+    required: true
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..dee52e3b2
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,13 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Ask a question
+    url: https://github.com/go-kit/kit/discussions/new?category=q-a
+
+  - name: Website
+    url: https://gokit.io/
+
+  - name: Reference
+    url: https://pkg.go.dev/github.com/go-kit/kit
+
+  - name: Slack channel
+    url: https://gophers.slack.com/messages/go-kit
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 3d7352686..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,10 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-title: ''
-labels: ''
-assignees: ''
-
----
-
-**What would you like?**
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 000000000..a28edd669
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,8 @@
+name: Feature request
+description: Suggest new functionality or an enhancement
+body:
+- type: textarea
+  attributes:
+    label: What would you like?
+  validations:
+    required: true