diff --git a/.github/workflows/auto-label-prs.yml b/.github/workflows/auto-label-prs.yml
index cfa4f302fe049..f0b8e9b343e29 100644
--- a/.github/workflows/auto-label-prs.yml
+++ b/.github/workflows/auto-label-prs.yml
@@ -1,4 +1,4 @@
-name: Label new PRs
+name: Label PRs
 on:
   pull_request:
     types: [opened,ready_for_review]
@@ -7,14 +7,15 @@ jobs:
   label-new-prs:
     runs-on: ubuntu-latest
     steps:
-      - name: Label new drafts
+      - name: Label drafts
         uses: andymckay/labeler@master
         if: github.event.pull_request.draft == true
         with:
           add-labels: 'A3-inprogress'
-      - name: Label new PRs
+          remove-labels: 'A0-pleasereview'
+      - name: Label PRs
         uses: andymckay/labeler@master
-        if: github.event.pull_request.draft == false
+        if: github.event.pull_request.draft == false && ! contains(github.event.pull_request.labels.*.name, 'A2-insubstantial')
         with:
           add-labels: 'A0-pleasereview'
           remove-labels: 'A3-inprogress'