diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 0000000000..fc5f33e21f
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,7 @@
+contact_links:
+  - name: Language Proposal
+    about: Propose to improve the Zig language
+    url: https://github.com/ziglang/zig/wiki/Language-Proposals
+  - name: Question
+    about: Please use one of the community spaces for questions or general discussions.
+    url: https://github.com/ziglang/zig/wiki/Community
diff --git a/.github/ISSUE_TEMPLATE/proposal.yml b/.github/ISSUE_TEMPLATE/proposal.yml
deleted file mode 100644
index 83e30d2ef4..0000000000
--- a/.github/ISSUE_TEMPLATE/proposal.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-name: Language Proposal
-description: Propose to improve the Zig language
-labels: ["proposal"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Thank you for your interest in improving the Zig language. However, we are
-        not accepting new proposals to change the language at this time.
-  - type: checkboxes
-    id: trash
-    attributes:
-      label: Please do not file a proposal to change the language
-      options:
-        - label: "I understand, thank you. I will not submit a new proposal at this time"
-          required: true
diff --git a/.github/ISSUE_TEMPLATE/question.yml b/.github/ISSUE_TEMPLATE/question.yml
deleted file mode 100644
index 1e57fc76d4..0000000000
--- a/.github/ISSUE_TEMPLATE/question.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Question
-description: Ask a Zig-related question
-labels: ["question"]
-body:
-  - type: markdown
-    attributes:
-      value: |
-        Welcome! There are a bunch of great places to ask Zig-related questions.
-        Please take a look at
-        [The Community Wiki Page](https://github.com/ziglang/zig/wiki/Community) and
-        find a comfy place to ask questions. You will find plenty of helpful people in
-        these spaces. However, this issue tracker is not for questions. It is for
-        more actionable items such as bug reports and enhancements.
-  - type: checkboxes
-    id: trash
-    attributes:
-      label: Please do not open a question issue on the bug tracker
-      options:
-        - label: "I understand, thank you. I will take my question to one of the community spaces instead"
-          required: true