diff --git a/.github/ISSUE_TEMPLATE/Bug Report.yaml b/.github/ISSUE_TEMPLATE/Bug Report.yaml
new file mode 100644
index 00000000..11e2f3a1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/Bug Report.yaml	
@@ -0,0 +1,37 @@
+name: Bug Report
+description: File a bug report
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: what-happened
+    attributes:
+      label: What happened?
+      description: Also, what did you expect to happen?
+    validations:
+      required: true
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant log output
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      render: shell
+  - type: textarea
+    id: version
+    attributes:
+      label: Version?
+      description: What version of Shairport Sync are you running? (`shairport-sync -V`)
+    validations:
+      required: true
+  - type: checkboxes
+    id: checked-current-issues
+    attributes:
+      label: Check previous issues
+      description: Please check previous issues (including closed ones) for duplicates.
+      options:
+        - label: Confirm
+          required: true
\ No newline at end of file
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..08744522
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,8 @@
+blank_issues_enabled: false
+contact_links:
+  - name: Questions?
+    url: https://github.com/mikebrady/shairport-sync/discussions/categories/q-a
+    about: Please ask and answer questions here.
+  - name: Feature Requests
+    url: https://github.com/mikebrady/shairport-sync/discussions/categories/ideas
+    about: Please submit feature requests/enhancements here.
\ No newline at end of file
diff --git a/.gitignore b/.gitignore
index 4f2b703b..9acdfd33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@ Makefile.in
 aclocal.m4
 autom4te.cache
 compile
-config.*
+/config.*
 configure
 depcomp
 install-sh