diff --git a/.github/ISSUE_TEMPLATE/4-report-a-flaky-test.md b/.github/ISSUE_TEMPLATE/4-report-a-flaky-test.md
deleted file mode 100644
index 544c9d5f47b0f5..00000000000000
--- a/.github/ISSUE_TEMPLATE/4-report-a-flaky-test.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Report a flaky test
-about: Report a flaky test in our CI
-labels: "CI / flaky test"
-
----
-
-<!--
-Thank you for reporting a flaky test.
-
-Flaky tests are tests that fail occasionally in the Node.js CI, but not
-consistently enough to block PRs from landing, or that are failing in CI jobs or
-test modes that are not run for every PR.
-
-Please fill in as much of the template below as you're able.
-
-Test: The test that is flaky - e.g. `test-fs-stat-bigint`
-Platform: The platform the test is flaky on - e.g. `macos` or `linux`
-Console Output: A pasted console output from a failed CI job showing the whole
-failure of the test
-Build Links: Links to builds affected by the flaky test
-
-If any investigation has been done, please include any information found, such
-as how consistently the test fails, whether the failure could be reproduced
-locally, when the test started failing, or anything else you think is relevant.
--->
-
-* **Test**:
-* **Platform**:
-* **Console Output:**
-```
-REPLACE ME
-```
-* **Build Links**:
diff --git a/.github/ISSUE_TEMPLATE/4-report-a-flaky-test.yml b/.github/ISSUE_TEMPLATE/4-report-a-flaky-test.yml
new file mode 100644
index 00000000000000..2ad659dec38917
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/4-report-a-flaky-test.yml
@@ -0,0 +1,47 @@
+name: Report a flaky test
+description: Report a flaky test in our CI
+title: "Investigate flaky test - "
+labels: ["flaky-test"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thank you for reporting a flaky test.
+
+        Flaky tests are tests that fail occasionally in the Node.js CI, but not
+        consistently enough to block PRs from landing, or that are failing in CI
+        jobs or test modes that are not run for every PR.
+
+        Please fill in as much of the form below as you're able.
+  - type: input
+    attributes:
+      label: Test
+      description: The test that is flaky.
+      placeholder: e.g. `test-fs-stat-bigint`
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Platform
+      description: The platform the test is flaky on.
+      placeholder: e.g. `macos` or `linux`
+  - type: textarea
+    attributes:
+      label: Console output
+      description: >
+        A pasted console output from a failed CI job showing the whole failure
+        of the test.
+      render: console
+  - type: textarea
+    attributes:
+      label: Build links
+      description: Links to builds affected by the flaky test.
+      value: '- '
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: >
+        If any investigation has been done, please include any information
+        found, such as how consistently the test fails, whether the failure
+        could be reproduced locally, when the test started failing, or anything
+        else you think is relevant.