diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index be0ef46018..0000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-name: Bug report
-about: Create a report to help us improve
-
----
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**Steps To Reproduce**
-1. 
-2. 
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**System Information**
- - OS: 
- - BOINC Version: 
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
new file mode 100644
index 0000000000..3163468cf9
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,43 @@
+name: Bug report
+description: Create a report to help us improve.
+body:
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      placeholder: "<!-- A clear and concise description of what the bug is. -->"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to reproduce
+      placeholder: |
+        1. 
+        2. 
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      placeholder: "<!-- A clear and concise description of what you expected to happen. -->"
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Screenshots
+      placeholder: "<!-- If applicable, add screenshots to help explain your problem. -->"
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: System information
+      placeholder: |
+        - OS:            
+        - BOINC Version: 
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      placeholder: "<!-- Add any other context about the problem here. -->"
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index f515242155..0000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for this project
-
----
-
-**Describe the problem**
-A clear and concise description of the problem you're looking to solve.
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml
new file mode 100644
index 0000000000..5092a596e3
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request.yml
@@ -0,0 +1,21 @@
+name: Feature request
+description: Suggest an idea for this project.
+body:
+  - type: textarea
+    attributes:
+      label: Describe the problem
+      placeholder: "<!-- A clear and concise description of what the problem is. e.g. I'm always frustrated when [...] -->"
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Describe the solution you'd like
+      placeholder: "<!-- A clear and concise description of what you want to happen. -->"
+    validations:
+      required: false
+  - type: textarea
+    attributes:
+      label: Additional context
+      placeholder: "<!-- A clear and concise description of any alternative solutions or features you've considered. -->"
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/other-issues.md b/.github/ISSUE_TEMPLATE/other-issues.md
deleted file mode 100644
index c7d272147c..0000000000
--- a/.github/ISSUE_TEMPLATE/other-issues.md
+++ /dev/null
@@ -1,7 +0,0 @@
----
-name: Other issues
-about: Use this template for any other issues.
-
----
-
-This template is for miscellaneous issues not covered by the other issue categories.
diff --git a/.github/ISSUE_TEMPLATE/other-issues.yml b/.github/ISSUE_TEMPLATE/other-issues.yml
new file mode 100644
index 0000000000..043e73bf96
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/other-issues.yml
@@ -0,0 +1,9 @@
+name: Other issues
+description: Use this template for any other issues.
+body:
+  - type: textarea
+    attributes:
+      label: Describe the bug
+      placeholder: "<!-- A clear and concise description of what the bug is. -->"
+    validations:
+      required: true