diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 1b49280..0000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us fix something that is broken
-title: ''
-labels: Bug
-assignees: PHLAK
----
-
-**Directory Lister Version**
-
-<!-- What version of Directory Lister are you using? -->
-
-**PHP Version**
-
-<!-- What version of PHP do you have installed? -->
-<!-- Run `php --version` from a command line to find your version -->
-<!-- Reminder: Directory Lister requires PHP 7.2+ -->
-
-**PHP Extensions**
-
-<!-- What PHP extensions do you have installed? -->
-<!-- Run `php -m` from a command line and paste the output here -->
-
-**HTTP Server**
-
-<!-- What HTTP server are you using to serve Directory Lister? Examples: Apache, NGINX, etc. -->
-
-**Describe the bug**
-
-<!-- A description of the observed behavior -->
-
-**Steps To Reproduce**
-
-<!-- The steps required to reproduce the error -->
-
-**Expected behavior**
-
-<!-- What did you expect to happen instead? -->
-
-**Additional context**
-
-<!-- Add any other context about the problem. Error logs would be helpful here. -->
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
new file mode 100644
index 0000000..358e3a8
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -0,0 +1,55 @@
+name: Bug Report
+description: Create a report to help us fix something that is broken
+labels: [Bug]
+assignees: [PHLAK]
+
+body:
+  - type: input
+    id: directory-lister-version
+    attributes:
+      label: Directory Lister Version
+      description: What version of Directory Lister are you using?
+      placeholder: '3.X.X'
+    validations:
+      required: true
+
+  - type: input
+    id: php-version
+    attributes:
+      label: PHP Version
+      description: |
+        What version of PHP do you have installed?
+        Run `php --version` from a command line to find your version.
+      placeholder: '8.1'
+    validations:
+      required: true
+
+  - type: textarea
+    id: php-extensions
+    attributes:
+      label: PHP Extensions
+      description: |
+        What PHP extensions do you have installed?
+        Run `php -m` from a command line and paste the output here.
+    validations:
+      required: false
+
+  - type: input
+    id: web-server
+    attributes:
+      label: Web Server
+      description: |
+        What HTTP web server are you using to serve Directory Lister?
+        **Examples:** Apache, NGINX, Lighttpd, etc.
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the Bug
+      description: |
+        A description of the observed behavior and any other context about the problem.
+        Error logs and/or steps required to reproduce the error would be helpful here.
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 562d614..0000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,23 +0,0 @@
----
-name: Feature Request / Enhancement
-about: Suggest a new feature or improvement to existing functionality
-title: ''
-labels: Enhancement
-assignees: PHLAK
----
-
-**Is your feature request related to a problem? Please describe.**
-
-<!-- A description of what the problem is. Example: I'm always frustrated when... -->
-
-**Describe the solution you'd like**
-
-<!-- Describe what you want to happen. -->
-
-**Describe possible alternatives**
-
-<!-- Have you considered any alternative solutions to the problem? -->
-
-**Additional context**
-
-<!-- Add any other context or screenshots about the feature request here. -->