diff --git a/.github/workflows/closed-issues.yml b/.github/workflows/closed-issues.yml
deleted file mode 100644
index b8ef53d4a471..000000000000
--- a/.github/workflows/closed-issues.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-name: Labeling closed issues
-on:
-  workflow_dispatch
-#  issues:
-#    types: ['closed']
-
-permissions:
-  contents: read
-
-jobs:
-  automate-issues-labels:
-    permissions:
-      issues: write  # for andymckay/labeler to label issues
-      pull-requests: write  # for andymckay/labeler to label PRs
-    runs-on: ubuntu-latest
-    if: github.repository == 'llvm/llvm-project'
-    steps:
-      - uses: andymckay/labeler@1.0.4
-        with:
-          remove-labels: 'awaiting-review'
diff --git a/.github/workflows/new-issues-labeler.yml b/.github/workflows/new-issues-labeler.yml
new file mode 100644
index 000000000000..e6ac60960165
--- /dev/null
+++ b/.github/workflows/new-issues-labeler.yml
@@ -0,0 +1,32 @@
+'new issue':
+  - '/.*/'
+
+'clang':
+  - '/\bclang(?!\-)\b/i'
+
+'clang-format':
+  - '/\bclang-format/i'
+
+'clang-tidy':
+  - '/\bclang-tidy/i'
+
+'libc++':
+  - '/libc[+x]{2}(?!\-)/i'
+
+'libc++-abi':
+  - '/libc[+x]{2}-abi/i'
+
+'libc':
+  - '/\blibc(?![-+])\b/i'
+
+'flang':
+  - '/\bflang(?!\-)\b/i'
+
+'lld':
+  - '/\blld(?!\-)\b/i'
+
+'mlir':
+  - '/\bmlir(?!\-)\b/i'
+
+'bolt':
+  - '/\bbolt(?!\-)\b/i'
diff --git a/.github/workflows/new-issues.yml b/.github/workflows/new-issues.yml
index cd5fa1d58347..82550f26e899 100644
--- a/.github/workflows/new-issues.yml
+++ b/.github/workflows/new-issues.yml
@@ -9,12 +9,15 @@ permissions:
 jobs:
   automate-issues-labels:
     permissions:
-      issues: write  # for andymckay/labeler to label issues
-      pull-requests: write  # for andymckay/labeler to label PRs
+      issues: write
     runs-on: ubuntu-latest
     if: github.repository == 'llvm/llvm-project'
     steps:
-      - uses: andymckay/labeler@1.0.4
+      - uses: github/issue-labeler@v3.2
         with:
-          add-labels: 'new issue'
-          ignore-if-labeled: true
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+          configuration-path: .github/workflows/new-issues-labeler.yml
+          include-title: 1
+          include-body: 0
+          sync-labels: 0
+          enable-versioned-regex: 0