diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
deleted file mode 100644
index 7cb20c0..0000000
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Bug report
-about: Tell us about a bug.
-labels: bug
----
-
-### TL;DR
-<!-- Describe the bug in 1-2 sentences below. -->
-
-**Expected behavior**
-<!-- What did you expect to happen? Please share below. -->
-
-**Observed behavior**
-<!-- What did happened instead? Please share below. -->
-
-
-### Reproduction
-
-**Action YAML**
-<!-- Add your complete GitHub Actions YAML below. -->
-
-```yaml
-# Paste your complete GitHub Actions YAML here, removing
-# any sensitive values.
-```
-
-**Repository**
-<!-- Is your repository public? If so, please link to it. -->
-<!-- If your repository is not public, delete this section. -->
-
-
-**Additional information**
-<!-- Are you running custom workers? Doing something atypical? Etc? -->
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 0000000..505a9ba
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,43 @@
+name: 'Bug report'
+description: 'File a bug report'
+labels: ['bug']
+body:
+- type: 'markdown'
+  attributes:
+    value: |-
+      Thank you for filing an bug. Please complete the form below so we can triage, reproduce, and fix your issue.
+
+- id: 'tldr'
+  type: 'textarea'
+  attributes:
+    label: 'TL;DR'
+    description: 'Describe the bug in 1-2 sentences.'
+  validations:
+    required: true
+
+- id: 'expected_behavior'
+  type: 'textarea'
+  attributes:
+    label: 'Expected behavior'
+    description: 'What did you expect to happen?'
+
+- id: 'observed_behavior'
+  type: 'textarea'
+  attributes:
+    label: 'Observed behavior'
+    description: 'What happened instead?'
+
+- id: 'action_yaml'
+  type: 'textarea'
+  attributes:
+    label: 'Action YAML'
+    description: 'Paste your complete GitHub Actions YAML here, removing any sensitive values.'
+    render: 'yaml'
+  validation:
+    required: true
+
+- id: 'additional'
+  type: 'textarea'
+  attributes:
+    label: 'Additional information'
+    description: 'Is there anything else you think we should know?'
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
deleted file mode 100644
index 9d3ba81..0000000
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Feature
-about: Request a new feature or functionality.
-labels: feature
----
-
-### TL;DR
-<!-- Describe the feature in 1-2 sentences below. -->
-
-
-### Design
-
-**Action YAML**
-<!-- What do you envision the action to look like?  -->
-<!-- If this is not relevant, delete this section. -->
-
-```yaml
-# Paste your proposed GitHub Actions YAML here.
-```
-
-**Resources**
-<!-- Please provide links to relevant documentation or examples. -->
-
-- [Link to documentation](TODO)
-
-
-**Additional information**
-<!-- Are you running custom workers? Doing something atypical? Etc? -->
diff --git a/.github/ISSUE_TEMPLATE/feature.yaml b/.github/ISSUE_TEMPLATE/feature.yaml
new file mode 100644
index 0000000..d7e201d
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.yaml
@@ -0,0 +1,29 @@
+name: 'Feature request'
+description: 'File a feature request'
+labels: ['enhancement']
+body:
+- type: 'markdown'
+  attributes:
+    value: |-
+      Thank you for requesting a feature. Please complete the form below so we can triage and prioritize your feature.
+
+- id: 'tldr'
+  type: 'textarea'
+  attributes:
+    label: 'TL;DR'
+    description: 'Describe the feature in 1-2 sentences.'
+  validations:
+    required: true
+
+- id: 'detailed_design'
+  type: 'textarea'
+  attributes:
+    label: 'Detailed design'
+    description: 'Do you have more information about a detailed design? Are there specific considerations to take? Include sample YAML.'
+    render: 'markdown'
+
+- id: 'additional'
+  type: 'textarea'
+  attributes:
+    label: 'Additional information'
+    description: 'Is there anything else you think we should know?'
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
deleted file mode 100644
index 1543b2b..0000000
--- a/.github/ISSUE_TEMPLATE/question.md
+++ /dev/null
@@ -1,9 +0,0 @@
----
-name: Question
-about: Ask us a question.
-labels: question
----
-
-### Question
-<!-- Ask your question in 1-2 sentences below. -->
-<!-- If sharing code, please use ``` codeblocks -->