diff --git a/.github/workflows/blazor-hybrid-issue-processing.yml b/.github/workflows/blazor-hybrid-issue-processing.yml
new file mode 100644
index 000000000000..b1f182c70c9a
--- /dev/null
+++ b/.github/workflows/blazor-hybrid-issue-processing.yml
@@ -0,0 +1,45 @@
+name: Issue processing
+on:
+  issues:
+    types:
+      - opened
+jobs:
+  process-blazor-issue:
+    if: contains(github.event.issue.body, 'aspnet/core/blazor/hybrid')
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+    steps:
+      - uses: actions/github-script@v6
+        with:
+          script: |
+            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-hybrid/subsvc"]
+            })
+            await github.rest.issues.addLabels({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              labels: ["Blazor Hybrid"]
+            })
+            await github.rest.issues.addAssignees({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              assignees: ["guardrex", "BethMassi"]
+            })
+            await github.rest.issues.removeLabel({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              name: [":watch: Not Triaged"]
+            })
diff --git a/.github/workflows/blazor-issue-processing.yml b/.github/workflows/blazor-issue-processing.yml
index b4b31ca8e741..11c2bae47f35 100644
--- a/.github/workflows/blazor-issue-processing.yml
+++ b/.github/workflows/blazor-issue-processing.yml
@@ -2,10 +2,15 @@ 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') 
+      && !contains(github.event.issue.body, 'aspnet/core/blazor/hybrid'))
+      || contains(github.event.issue.body, 'client-side/dotnet-interop/index.md')
+      || contains(github.event.issue.body, 'client-side/dotnet-interop/wasm-browser-app.md')
+      || contains(github.event.issue.body, 'mvc/views/tag-helpers/built-in/component-tag-helper.md')
+      || contains(github.event.issue.body, 'mvc/views/tag-helpers/built-in/persist-component-state.md')
     runs-on: ubuntu-latest
     permissions:
       issues: write
@@ -20,6 +25,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,
diff --git a/.github/workflows/issue-processing.yml b/.github/workflows/issue-processing.yml
index da222440fe8a..bae690717316 100644
--- a/.github/workflows/issue-processing.yml
+++ b/.github/workflows/issue-processing.yml
@@ -35,31 +35,3 @@ jobs:
               repo: context.repo.repo,
               labels: ["SignalR"]
             })
-
-  process-blazorhybrid-issue:
-    if: github.event.label.name == 'blazor-hybrid/subsvc'
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write
-    steps:
-      - uses: actions/github-script@v6
-        with:
-          script: |
-            await github.rest.issues.addLabels({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              labels: ["Blazor Hybrid"]
-            })
-            await github.rest.issues.addAssignees({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              assignees: ["guardrex", "BethMassi"]
-            })
-            await github.rest.issues.removeLabel({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              name: [":watch: Not Triaged"]
-            })