diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
new file mode 100644
index 00000000000..8886aa6a7e4
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -0,0 +1,40 @@
+name: Bug report
+description: Use this template for reporting bugs. Please search existing issues first.
+title: '[Bug]: '
+labels: bug
+body:
+  - type: markdown
+    attributes:
+      value: '## Environment'
+  - type: input
+    attributes:
+      label: k6 version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: 'Docker version and image'
+  - type: dropdown
+    attributes:
+      label: OS
+      options:
+        - Windows
+        - Linux
+        - Mac
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Expected Behaviour
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Actual Behaviour
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Steps to Reproduce the Problem
+    validations:
+      required: true
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index 6484e19e1e3..00000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-name: Bug report
-about: Use this template for reporting bugs. Please search existing issues first.
-labels: bug
----
-
-<!--- Provide a general summary of the issue in the Title above -->
-
-## Environment
-<!--- Provide as much information about your environment as possible: output from `k6 version`,
-      OCI runtime and image information if using containers, cloud execution environment, etc. -->
-- k6 version:
-- OS and version:
-- Docker version and image, if applicable:
-
-
-## Expected Behavior
-<!--- Tell us what should happen -->
-
-
-## Actual Behavior
-<!--- Tell us what happens instead of the expected behavior -->
-
-
-## Steps to Reproduce the Problem
-<!--- Provide the exact commands, environment variables and relevant script(s) to reproduce this bug. -->
-
-1.
-2.
-3.
diff --git a/.github/ISSUE_TEMPLATE/feat_req.md b/.github/ISSUE_TEMPLATE/feat_req.md
deleted file mode 100644
index e9839b9b76a..00000000000
--- a/.github/ISSUE_TEMPLATE/feat_req.md
+++ /dev/null
@@ -1,14 +0,0 @@
----
-name: Feature request
-about: Use this template for suggesting new features.
-labels: feature
----
-
-<!--- Provide a general summary of the feature in the Title above -->
-
-## Feature Description
-<!--- Describe the feature in detail: what benefits it would have, which problem it would solve, use cases, examples, etc. -->
-
-
-## Suggested Solution (optional)
-<!--- Any implementation suggestions you might have: technical details, design tradeoffs, API proposals, etc. -->
diff --git a/.github/ISSUE_TEMPLATE/feat_req.yaml b/.github/ISSUE_TEMPLATE/feat_req.yaml
new file mode 100644
index 00000000000..57bb6e68e54
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feat_req.yaml
@@ -0,0 +1,15 @@
+name: Feature Request
+description: Use this template for suggesting new features.
+title: '[Feature Request]: '
+labels: feature
+body:
+  - type: textarea
+    attributes:
+      label: Feature Description
+      description: A clear and concise description of the problem or missing capability
+    validations:
+      required: true
+  - type: textarea
+    attributes:
+      label: Suggested Solution (optional)
+      description: If you have a solution in mind, please describe it.