diff --git a/.github/ISSUE_TEMPLATE/1.bug.yml b/.github/ISSUE_TEMPLATE/1.bug.yml
index cc7cebb38c1..1c944209a05 100644
--- a/.github/ISSUE_TEMPLATE/1.bug.yml
+++ b/.github/ISSUE_TEMPLATE/1.bug.yml
@@ -5,21 +5,6 @@ body:
   - type: markdown
     attributes:
       value: Thanks for contributing by creating an issue! ❤️ Please provide a searchable summary of the issue in the title above ⬆️.
-  - type: input
-    attributes:
-      label: Search keywords
-      description: |
-        Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/mui-toolpad/issues).
-        If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
-    validations:
-      required: true
-  - type: checkboxes
-    attributes:
-      label: Latest version
-      description: We roll bug fixes, performance enhancements, and other improvements into new releases.
-      options:
-        - label: I have tested the latest version
-          required: true
   - type: textarea
     attributes:
       label: Steps to reproduce
@@ -59,3 +44,18 @@ body:
           Output from `npx @mui/envinfo` goes here.
         ```
         </details>
+  - type: input
+    attributes:
+      label: Search keywords
+      description: |
+        Your issue may have already been reported! First search for duplicates among the [existing issues](https://github.com/mui/mui-toolpad/issues).
+        If your issue isn't a duplicate, great! Please list the keywords you used so people in the future can find this one more easily:
+    validations:
+      required: true
+  - type: checkboxes
+    attributes:
+      label: Latest version
+      description: We roll bug fixes, performance enhancements, and other improvements into new releases.
+      options:
+        - label: I have tested the latest version
+          required: true
diff --git a/.github/workflows/issue-cleanup.yml b/.github/workflows/issue-cleanup.yml
deleted file mode 100644
index 0da67dc0a80..00000000000
--- a/.github/workflows/issue-cleanup.yml
+++ /dev/null
@@ -1,52 +0,0 @@
-name: Cleanup issue comment
-
-on:
-  issues:
-    types:
-      - opened
-
-permissions: {}
-
-jobs:
-  issue_cleanup:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7
-        with:
-          script: |
-            const issue = await github.rest.issues.get({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-            })
-
-            const lines = issue.data.body.split('\n')
-
-            const _ = extractInputSection(lines, 'Latest version')
-            const searchKeywords = extractInputSection(lines, 'Search keywords')
-            const orderID = extractInputSection(lines, 'Order ID or Support key')
-
-            lines.push('')
-            lines.push('**Search keywords**: ' + searchKeywords)
-            if (orderID !== '' && orderID !== '_No response_') {
-              lines.push('**Order ID**: ' + orderID)
-            }
-
-            const body = lines.join('\n')
-
-            await github.rest.issues.update({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              body,
-            })
-
-            function extractInputSection(lines, title) {
-              const index = lines.findIndex(line => line.startsWith('###') && line.includes(title))
-              if (index === -1) {
-                return ''
-              }
-              return lines.splice(index, 4)[2].trim()
-            }