diff --git a/.github/ISSUE_TEMPLATE/BUG.yml b/.github/ISSUE_TEMPLATE/BUG.yml
new file mode 100644
index 000000000..9adc2b03a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/BUG.yml
@@ -0,0 +1,119 @@
+name: "Bug Report"
+description: Report a bug with pyton.org website to help us improve
+title: "Bug:
"
+labels: ["bug", "Triage Required"]
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ This is the repository and issue tracker for the https://www.pyton.org website.
+
+ If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
+
+ Issues related to [Python's documentation](https://docs.python.org) can also be filed [here](https://github.com/python/cpython/issues/new?assignees=&labels=docs&template=documentation.md).
+
+ - type: textarea
+ id: description
+ attributes:
+ label: "Describe the bug"
+ description: A clear and concise description of what the bug is.
+ validations:
+ required: true
+
+ - type: textarea
+ id: reproduction
+ attributes:
+ label: "To Reproduce"
+ description: Steps to reproduce the behavior
+ placeholder: |
+ 1. Go to '...'
+ 2. Click on '....'
+ 3. Scroll down to '....'
+ 4. See error
+ validations:
+ required: true
+
+ - type: textarea
+ id: expected
+ attributes:
+ label: "Expected behavior"
+ description: A clear and concise description of what you expected to happen.
+ validations:
+ required: true
+
+ - type: input
+ id: reprod-url
+ attributes:
+ label: "URL to the issue"
+ description: Please enter the URL to provide a reproduction of the issue, if applicable
+ placeholder: ex. https://python.org/my-issue/here
+ validations:
+ required: false
+
+ - type: textarea
+ id: screenshot
+ attributes:
+ label: "Screenshots"
+ description: If applicable, add screenshots to help explain your problem.
+ value: |
+ ""
+ render: bash
+ validations:
+ required: false
+
+ - type: dropdown
+ id: browsers
+ attributes:
+ label: "Browsers"
+ description: What browsers are you seeing the problem on?
+ multiple: true
+ options:
+ - Firefox
+ - Chrome
+ - Safari
+ - Microsoft Edge
+ - Other
+ validations:
+ required: true
+
+ - type: dropdown
+ id: os
+ attributes:
+ label: "Operating System"
+ description: What operating system are you using?
+ options:
+ - Windows
+ - macOS
+ - Linux
+ - iOS
+ - Android
+ - Other
+ validations:
+ required: true
+
+ - type: input
+ id: version
+ attributes:
+ label: "Browser Version"
+ description: What version of the browser are you using?
+ placeholder: "e.g. 22"
+ validations:
+ required: false
+
+ - type: textarea
+ id: logs
+ attributes:
+ label: "Relevant log output"
+ description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+ render: shell
+ validations:
+ required: false
+
+ - type: textarea
+ id: additional
+ attributes:
+ label: "Additional context"
+ description: Add any other context about the problem here.
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/DOCS.yml b/.github/ISSUE_TEMPLATE/DOCS.yml
new file mode 100644
index 000000000..df7a2c231
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/DOCS.yml
@@ -0,0 +1,23 @@
+name: "Documentation Update"
+description: Create an issue for documentation changes
+title: "Docs: "
+labels: ["documentation"]
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ This is the repository and issue tracker for the https://www.pyton.org website.
+
+ If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
+
+ Issues related to [Python's documentation](https://docs.python.org) can also be filed [here](https://github.com/python/cpython/issues/new?assignees=&labels=docs&template=documentation.md).
+
+ - type: textarea
+ id: summary
+ attributes:
+ label: "Summary"
+ description: Provide a brief summary of your request
+ placeholder: We need to update the documentation to include information about...
+ validations:
+ required: true
diff --git a/.github/ISSUE_TEMPLATE/REQUEST.yml b/.github/ISSUE_TEMPLATE/REQUEST.yml
new file mode 100644
index 000000000..144ad75c1
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/REQUEST.yml
@@ -0,0 +1,66 @@
+name: "Feature Request"
+description: Suggest an idea for www.pyton.org
+title: "Enhancement: "
+labels: ["enhancement"]
+
+body:
+ - type: markdown
+ attributes:
+ value: |
+ This is the repository and issue tracker for the https://www.pyton.org website.
+
+ If you're looking to file an issue with CPython itself, please click here: [CPython Issues](https://github.com/python/cpython/issues/new/choose).
+
+ Issues related to [Python's documentation](https://docs.python.org) can also be filed [here](https://github.com/python/cpython/issues/new?assignees=&labels=docs&template=documentation.md).
+
+ - type: textarea
+ id: problem
+ attributes:
+ label: "Is your feature request related to a problem? Please describe."
+ description: A clear and concise description of what the problem is.
+ placeholder: Ex. I'm always frustrated when [...]
+ validations:
+ required: true
+
+ - type: textarea
+ id: solution
+ attributes:
+ label: "Describe the solution you'd like"
+ description: A clear and concise description of what you want to happen.
+ placeholder: Ex. It would be great if [...]
+ validations:
+ required: true
+
+ - type: textarea
+ id: basic_example
+ attributes:
+ label: "Basic Example"
+ description: Provide some basic examples of your feature request.
+ placeholder: Describe how your feature would work with a simple example.
+ validations:
+ required: false
+
+ - type: textarea
+ id: alternatives
+ attributes:
+ label: "Describe alternatives you've considered"
+ description: A clear and concise description of any alternative solutions or features you've considered.
+ validations:
+ required: false
+
+ - type: textarea
+ id: drawbacks
+ attributes:
+ label: "Drawbacks and Impact"
+ description: What are the drawbacks or impacts of your feature request?
+ placeholder: Describe any potential drawbacks or impacts of implementing this feature.
+ validations:
+ required: false
+
+ - type: textarea
+ id: additional_context
+ attributes:
+ label: "Additional context"
+ description: Add any other context or screenshots about the feature request here.
+ validations:
+ required: false
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
deleted file mode 100644
index c958c11a4..000000000
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-name: Bug report
-about: Report a bug with Python.org website to help us improve
----
-
-
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Browser [e.g. chrome, safari]
- - Version [e.g. 22]
-
-**Smartphone (please complete the following information):**
- - Device: [e.g. iPhone6]
- - OS: [e.g. iOS8.1]
- - Browser [e.g. stock browser, safari]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 000000000..cd8c31d2a
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1,14 @@
+blank_issues_enabled: false
+contact_links:
+ - name: CPython Documentation
+ url: https://docs.python.org/
+ about: Official CPython documentation - please check here before opening an issue.
+ - name: Python Website
+ url: https://python.org/
+ about: For all things Python
+ - name: PyPI Issues / Support
+ url: https://github.com/pypi/support
+ about: For issues with PyPI itself, PyPI accounts, or with packages hosted on PyPI.
+ - name: CPython Issues
+ url: https://github.com/python/cpython/issues
+ about: For issues with the CPython interpreter itself.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
deleted file mode 100644
index 514274e5f..000000000
--- a/.github/ISSUE_TEMPLATE/feature_request.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for www.python.org
----
-
-
-
-**Is your feature request related to a problem? Please describe.**
-A clear and concise description of what the problem is.
-
-**Describe the solution you'd like**
-A clear and concise description of what you want to happen. Ex. It would be great if [...]
-
-**Describe alternatives you've considered**
-A clear and concise description of any alternative solutions or features you've considered.
-
-**Additional context**
-Add any other context or screenshots about the feature request here.