diff --git a/.github/ISSUE_TEMPLATE/bug-report.yml b/.github/ISSUE_TEMPLATE/bug-report.yml
index 6b18de7bd1f..b24b305367f 100644
--- a/.github/ISSUE_TEMPLATE/bug-report.yml
+++ b/.github/ISSUE_TEMPLATE/bug-report.yml
@@ -1,81 +1,62 @@
----
 name: Bug report
 about: Something is not working correctly.
 title: ""
 labels: "S: needs triage, type: bug"
-issue_body: true  # default: true, adds a classic WSYWIG textarea, if on
-body:
-- type: markdown
-  attributes:
-    value: |
-      ⚠
-      If you're reporting an issue for `--use-feature=2020-resolver`,
-      use the "Dependency resolver failures / errors" template instead.
-- type: markdown
-  attributes:
-    value: "**Environment**"
-- type: input
-  attributes:
-    label: pip version
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: Python version
-  validations:
-    required: true
-- type: input
-  attributes:
-    label: OS
-  validations:
-    required: true
-- type: textarea
-  attributes:
-    label: Additional information
-    description: >-
-      Feel free to add more information about your environment here.
-
-- type: textarea
-  attributes:
-    label: Description
-    description: >-
-      A clear and concise description of what the bug is.
 
-- type: textarea
-  attributes:
-    label: Expected behavior
-    description: >-
-      A clear and concise description of what you expected to happen.
+body:
+  - type: textarea
+    attributes:
+      label: Description
+      description: >-
+        A clear and concise description of what the bug is.
+      validations:
+        required: true
 
-- type: textarea
-  attributes:
-    label: How to Reproduce
-    description: >-
-      Describe the steps to reproduce this bug.
-    value: |
-      1. Get package from '...'
-      2. Then run '...'
-      3. An error occurs.
+  - type: textarea
+    attributes:
+      label: Expected behavior
+      description: >-
+        A clear and concise description of what you expected to happen.
 
-- type: textarea
-  attributes:
-    label: Output
-    description: >-
-      Paste the output of the steps above, including the commands
-      themselves and pip's output/traceback etc.
-    value: |
-      ```console
+  - type: input
+    attributes:
+      label: pip version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: Python version
+    validations:
+      required: true
+  - type: input
+    attributes:
+      label: OS
+    validations:
+      required: true
 
-      ```
+  - type: textarea
+    attributes:
+      label: How to Reproduce
+      description: Please provide steps to reproduce this bug.
+      value: |
+        1. Get package from '...'
+        2. Then run '...'
+        3. An error occurs.
+      validations:
+        required: true
 
-- type: checkboxes
-  attributes:
-    label: Code of Conduct
-    description: |
-      Read the [PSF Code of Conduct][CoC] first.
+  - type: textarea
+    attributes:
+      label: Output
+      description: >-
+        Provide the output of the steps above, including the commands
+        themselves and pip's output/traceback etc.
+      render: sh-session
 
-      [CoC]: https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md
-    options:
-    - label: I agree to follow the PSF Code of Conduct
-      required: true
-...
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      options:
+        - label: >-
+            I agree to follow the [PSF Code of Conduct](https://www.python.org/psf/conduct/).
+          required: true
diff --git a/.github/ISSUE_TEMPLATE/resolver-failure.md b/.github/ISSUE_TEMPLATE/resolver-failure.md
deleted file mode 100644
index 09c23a040d9..00000000000
--- a/.github/ISSUE_TEMPLATE/resolver-failure.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-name: Dependency resolver failures / errors
-about: Report when the pip dependency resolver fails
-labels: ["K: UX", "K: crash", "C: new resolver", "C: dependency resolution"]
----
-
-<!--
-Please provide as much information as you can about your failure, so that we can understand the root cause.
-
-Try if your issue has been fixed in the in-development version of pip. Use the following command to install pip from the current development branch:
-
-    python -m pip install -U "pip @ https://github.com/pypa/pip/archive/main.zip"
--->
-
-**What did you want to do?**
-<!-- Include any inputs you gave to pip, for example:
-
-* Package requirements: any CLI arguments and/or your requirements.txt file
-* Already installed packages, outputted via `pip freeze`
--->
-
-**Output**
-
-```
-Paste what pip outputted in a code block. https://github.github.com/gfm/#fenced-code-blocks
-```
-
-**Additional information**
-
-<!--
-It would be great if you could also include your dependency tree. For this you can use pipdeptree: https://pypi.org/project/pipdeptree/
-
-For users installing packages from a private repository or local directory, please try your best to describe your setup. We'd like to understand how to reproduce the error locally, so would need (at a minimum) a description of the packages you are trying to install, and a list of dependencies for each package.
--->