diff --git a/.github/ISSUE_TEMPLATE/improve-existing-docs.md b/.github/ISSUE_TEMPLATE/improve-existing-docs.md
deleted file mode 100644
index 785235286e..0000000000
--- a/.github/ISSUE_TEMPLATE/improve-existing-docs.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Improve existing content
-about: Make a suggestion to improve the content in an existing article.
-title: ''
-labels:
-- content
-assignees: ''
----
-<!--
-HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT INSTEAD.
--->
-
-<!--
-For questions, ask in Discussions: https://github.com/github/docs/discussions
-
-Before you file an issue read the:
-- Code of Conduct: https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md
-- Contributing guide: https://github.com/github/docs/blob/main/CONTRIBUTING.md
-
-Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
--->
-
-### What article on docs.github.com is affected?
-
-<!-- Please link to the article you'd like to see updated -->
-
-### What part(s) of the article would you like to see updated?
-
-<!-- Give as much detail as you can to help us understand the change you want to see. Why should the docs be changed? What use cases does it support? What is the expected outcome? -->
-
-### Additional information
-
-<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/.github/ISSUE_TEMPLATE/improve-existing-docs.yaml b/.github/ISSUE_TEMPLATE/improve-existing-docs.yaml
new file mode 100644
index 0000000000..bdcd6a2949
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improve-existing-docs.yaml
@@ -0,0 +1,46 @@
+name: Improve existing content
+description: Make a suggestion to improve the content in an existing article
+labels:
+  - content
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **HUBBERS:** This is the github/docs open source repo. You may want to open an issue in the internal-only github/docs-content repo instead.
+
+        * For questions, ask in [Discussions](https://github.com/github/docs/discussions)
+        * Before you file an issue read the [Contributing guide](https://github.com/github/docs/blob/main/CONTRIBUTING.md)
+        * Check to make sure someone hasn't already opened a similar [issue](https://github.com/github/docs/issues)
+
+  - type: checkboxes
+    id: terms
+    attributes:
+      label: Code of Conduct
+      description: This project has a [Code of Conduct](https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md) that all participants are expected to understand and follow.
+      options:
+        - label: I have read and agree to the GitHub Docs project's Code of Conduct.
+          required: true
+
+  - type: textarea
+    attributes:
+      label: What article on docs.github.com is affected?
+      description: Please link to the article you'd like to see updated.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What part(s) of the article would you like to see updated?
+      description: |
+        - Give as much detail as you can to help us understand the change you want to see. 
+        - Why should the docs be changed? What use cases does it support? 
+        - What is the expected outcome?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: Add any other context or screenshots about the feature request here.
+    validations:
+      required: false
diff --git a/.github/ISSUE_TEMPLATE/improve-the-site.md b/.github/ISSUE_TEMPLATE/improve-the-site.md
deleted file mode 100644
index 958555ffc4..0000000000
--- a/.github/ISSUE_TEMPLATE/improve-the-site.md
+++ /dev/null
@@ -1,33 +0,0 @@
----
-name: Improve the docs.github.com site
-about: Make a suggestion or report a problem about the technical implementation of docs.github.com.
-title: ''
-labels: engineering
-assignees: ''
----
-
-<!--
-HUBBERS BEWARE! THE GITHUB/DOCS REPO IS PUBLIC TO THE ENTIRE INTERNET. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT INSTEAD.
--->
-
-<!--
-For questions, ask in Discussions: https://github.com/github/docs/discussions
-
-Before you file an issue read the:
-- Code of Conduct: https://github.com/github/docs/blob/main/CODE_OF_CONDUCT.md
-- Contributing guide: https://github.com/github/docs/blob/main/CONTRIBUTING.md
-
-Check to make sure someone hasn't already opened a similar issue: https://github.com/github/docs/issues
--->
-
-### What is the current behavior?
-
-<!-- Include links to articles where you're seeing a problem, screenshots, what browser you're using, etc. -->
-
-### What changes are you suggesting?
-
-<!-- Give as much detail as you can to help us understand the change you want to see. Why should the docs be changed? What use cases does it support? What is the expected outcome? -->
-
-### Additional information
-
-<!-- Any additional information, configuration, or data that might be necessary to reproduce the issue. -->
diff --git a/.github/ISSUE_TEMPLATE/improve-the-site.yml b/.github/ISSUE_TEMPLATE/improve-the-site.yml
new file mode 100644
index 0000000000..af1ca22238
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improve-the-site.yml
@@ -0,0 +1,47 @@
+name: Improve the docs.github.com site
+description: Make a suggestion or report a problem about the technical implementation of docs.github.com.
+labels:
+  - content
+body:
+  - type: markdown
+    attributes:
+      value: |
+        **HUBBERS!! THIS IS GITHUB/DOCS OPEN SOURCE REPO. OPEN AN ISSUE IN GITHUB/DOCS-CONTENT INSTEAD.**
+
+        * For questions, ask in [Discussions](https://github.com/github/docs/discussions)
+        * Before you file an issue read the [Contributing guide](https://github.com/github/docs/blob/main/CONTRIBUTING.md)
+        * Check to make sure someone hasn't already opened a similar [issue](https://github.com/github/docs/issues)
+
+  - type: checkboxes
+    attributes:
+      label: Code of Conduct
+      description: By submitting this issue, you agree to follow our [Code of Conduct](https://example.com)
+      options:
+        - label: I agree to follow this project's Code of Conduct
+          required: true
+
+  - type: textarea
+    attributes:
+      label: What article on docs.github.com is affected?
+      description: |
+        Include links to articles where you're seeing a problem, screenshots, what browser you're using, etc.
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: What changes are you suggesting?
+      description: |
+        - Give as much detail as you can to help us understand the change you want to see. 
+        - Why should the docs be changed? What use cases does it support? 
+        - What is the expected outcome?
+    validations:
+      required: true
+
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: |
+        Any additional information, configuration, or data that might be necessary to reproduce the issue.
+    validations:
+      required: false