diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml
index 177615621f6b8c7..fe1273804a5acb1 100644
--- a/.github/ISSUE_TEMPLATE/bug.yml
+++ b/.github/ISSUE_TEMPLATE/bug.yml
@@ -16,7 +16,7 @@ body:
         Make sure to also search the [CPython issue tracker](https://github.com/python/cpython/issues?q=is%3Aissue+sort%3Acreated-desc) to check that the bug has not already been reported.
   - type: textarea
     attributes:
-      label: "Bug description:"
+      label: "Bug report"
       description: >
         Give a clear and concise description of what happened.
         Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
diff --git a/.github/ISSUE_TEMPLATE/crash.yml b/.github/ISSUE_TEMPLATE/crash.yml
index 81ae91e5b0af973..690fe7721fdb8ed 100644
--- a/.github/ISSUE_TEMPLATE/crash.yml
+++ b/.github/ISSUE_TEMPLATE/crash.yml
@@ -10,8 +10,9 @@ body:
           The CPython interpreter is written in a different programming language, C. A "CPython crash" is when Python itself fails, leading to a traceback in the C stack.
   - type: textarea
     attributes:
-      label: What happened?
+      label: Crash report
       description: >
+        Give a clear and concise description of what happened.
         Include a [minimal, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example) if possible.
         [Copy and paste code where possible rather than using screenshots](https://meta.stackoverflow.com/a/285557/13990016),
         and put any code blocks inside triple backticks.
diff --git a/.github/ISSUE_TEMPLATE/feature.yml b/.github/ISSUE_TEMPLATE/feature.yml
index 4361ab2bf827fb6..3ecae7112170e0a 100644
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -12,7 +12,7 @@ body:
         Major feature proposals should generally be discussed on [Discourse](https://discuss.python.org/c/ideas/6) before opening a GitHub issue. Wait until it's clear that most people support your idea before filling in this form.
   - type: textarea
     attributes:
-      label: "Proposal:"
+      label: "Feature or enhancement"
       description: >
         Explain your proposal, why it should be implemented, and how it would be used.
         Add examples, if applicable.
diff --git a/.github/workflows/add-issue-header.yml b/.github/workflows/add-issue-header.yml
deleted file mode 100644
index 55095f17bb4cce9..000000000000000
--- a/.github/workflows/add-issue-header.yml
+++ /dev/null
@@ -1,56 +0,0 @@
-name: Add issue header
-# Automatically edits an issue's descriptions with a header,
-# one of:
-#
-# - Bug report
-# - Crash report
-# - Feature or enhancement
-
-on:
-  issues:
-    types:
-      # Only ever run once
-      - opened
-
-permissions:
-  contents: read
-
-jobs:
-  add-header:
-    runs-on: ubuntu-slim
-    permissions:
-      issues: write
-    timeout-minutes: 5
-    steps:
-      - uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0
-        with:
-          # language=JavaScript
-          script: |
-            // https://devguide.python.org/triage/labels/#type-labels
-            const HEADERS = new Map([
-              ['type-bug', 'Bug report'],
-              ['type-crash', 'Crash report'],
-              ['type-feature', 'Feature or enhancement'],
-            ]);
-            let issue_data = await github.rest.issues.get({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo
-            }).then(issue => issue.data);
-            let header = '';
-            for (const label_data of issue_data.labels) {
-                const label_name = (typeof label_data === 'string') ? label_data : label_data.name;
-                if (HEADERS.has(label_name)) {
-                    header = HEADERS.get(label_name);
-                    break;
-                }
-            }
-            if (header !== '') {
-              console.log(`Setting new header: ${header}`);
-              await github.rest.issues.update({
-                  issue_number: context.issue.number,
-                  owner: context.repo.owner,
-                  repo: context.repo.repo,
-                  body: `# ${header}\n\n${issue_data.body.replaceAll('\r', '')}`
-              });
-            }