diff --git a/.codespellignore b/.codespellignore
index 6c7a6601317..7bb8faaea6a 100644
--- a/.codespellignore
+++ b/.codespellignore
@@ -4,3 +4,4 @@ InOut
 copyable
 sord
 doubleClick
+Sur
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 00000000000..d0375978b09
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,28 @@
+name: 🐛 Bug Report
+description: |
+  Describe your problem here.
+labels: [bug]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug Description
+      description: Tell us what happens and what should happen instead.
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: What version of Mixxx are you running?
+      placeholder: 2.3.4, 2.4.0, ...
+  - type: input
+    id: os
+    attributes:
+      label: OS
+      description: What operating system (and distribution if you're on Linux) are you running?
+      placeholder: Windows 11, macOS Big Sur, Ubuntu 22.04, ...
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000000..2d140d84f33
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,5 @@
+blank_issues_enabled: true
+contact_links:
+  - name: 🤔 Question
+    url: https://mixxx.org/forums
+    about: Please use our forums for questions
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yaml b/.github/ISSUE_TEMPLATE/feature_request.yaml
new file mode 100644
index 00000000000..28fd84a9675
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yaml
@@ -0,0 +1,16 @@
+name: 🚀 Feature Request
+description: |
+  What feature would you like to see added to Mixxx?
+labels: [feature]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to suggest a new feature!
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Description
+      description: Describe describe your use-case, not yet supported and a possible solution.
+    validations:
+      required: true