diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
deleted file mode 100644
index 65ef484a..00000000
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug Report
-about: Create a report to help us improve
-title: ''
-labels: bug
-assignees: ''
----
-
-### Describe the bug
-
-A clear and concise description of what the bug is.
-
-### To Reproduce
-
-A link to some code to reproduce the bug can speed up a fix. Alternatively, show steps to reproduce the behaviour:
-
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-### Expected behaviour
-
-A clear and concise description of what you expected to happen.
-
-### Schema Objects
-
-Which [schema.org](https://schema.org) object is this about if any?
-
-- E.g. https://schema.org/Person
diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.yml b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
new file mode 100644
index 00000000..735bd88d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.yml
@@ -0,0 +1,39 @@
+name: "Bug Report"
+description: "Create a report to help us improve"
+title: "🐛 "
+labels: [bug]
+body:
+  - type: textarea
+    id: describe-the-bug
+    attributes:
+      label: "Describe the bug"
+      description: "A clear and concise description of what the bug is."
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: "Steps to reproduce"
+      description: "A link to some code to reproduce the bug can speed up a fix. Alternatively, show steps to reproduce the behaviour."
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behaviour
+    attributes:
+      label: "Expected behaviour"
+      description: "A clear and concise description of what you expected to happen."
+    validations:
+      required: true
+  - type: input
+    id: schema-objects
+    attributes:
+      label: "Schema objects"
+      description: "Which [schema.org](https://schema.org) object is this about if any?"
+      placeholder: "E.g. https://schema.org/Person"
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
deleted file mode 100644
index d5a6d2f9..00000000
--- a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md
+++ /dev/null
@@ -1,17 +0,0 @@
----
-name: Feature Request
-about: Suggest an idea for this project
-title: ''
-labels: enhancement
-assignees: ''
----
-
-### Describe the feature
-
-A clear and concise description of what the feature is.
-
-### Schema Objects
-
-Which [schema.org](https://schema.org) object is this about if any?
-
-- E.g. https://schema.org/Person
diff --git a/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
new file mode 100644
index 00000000..88e69ccc
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/FEATURE_REQUEST.yml
@@ -0,0 +1,20 @@
+name: "Feature Request"
+description: "Suggest an idea for this project"
+title: "🚀 "
+labels: [enhancement]
+body:
+  - type: textarea
+    id: describe-the-bug
+    attributes:
+      label: "Describe the feature"
+      description: "A clear and concise description of what the feature is."
+    validations:
+      required: true
+  - type: input
+    id: schema-objects
+    attributes:
+      label: "Schema objects"
+      description: "Which [schema.org](https://schema.org) object is this about if any?"
+      placeholder: "E.g. https://schema.org/Person"
+    validations:
+      required: false