diff --git a/.github/workflows/blazor-issue-processing.yml b/.github/workflows/blazor-issue-processing.yml
index b4b31ca8e741..762b152c633b 100644
--- a/.github/workflows/blazor-issue-processing.yml
+++ b/.github/workflows/blazor-issue-processing.yml
@@ -2,10 +2,10 @@ name: Issue processing
 on:
   issues:
     types:
-      - labeled
+      - opened
 jobs:
   process-blazor-issue:
-    if: github.event.label.name == 'blazor/subsvc'
+    if: contains(github.event.issue.body, 'aspnet/core/blazor')
     runs-on: ubuntu-latest
     permissions:
       issues: write
@@ -20,6 +20,18 @@ jobs:
               body: `### 🍂🎃🏮 *Autumn Skies and Pumpkin Pies!* 🥧☕🍂
             Stand by! A green dinosaur 🦖 will arrive shortly to assist.`
             })
+            await github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["aspnet-core/svc"]
+            })
+            await github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["blazor/subsvc"]
+            })
             await github.rest.issues.addLabels({
               issue_number: context.issue.number,
               owner: context.repo.owner,