diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 9566bbb255f..411e1242f5e 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -19,18 +19,12 @@ name: build
 
 on:
   push:
+    # These filters apply only to the current branch (`2.x`) and new branches cut from it:
+    # only `release/2*` branches automatically inherit this workflow.
     branches:
       - "2.x"
-      - "2.25.x"
       - "release/2*"
   pull_request:
-    types:
-      # Standard types
-      - opened
-      - synchronize
-      - reopened
-      # Used in Dependabot PRs to retrigger required workflows
-      - ready_for_review
 
 # Cancel in-progress runs when a newer commit lands on the same PR; pushes to 2.x run to completion.
 concurrency:
diff --git a/.github/workflows/codeql-analysis.yaml b/.github/workflows/codeql-analysis.yaml
index cf59560a10c..83e0b1753b5 100644
--- a/.github/workflows/codeql-analysis.yaml
+++ b/.github/workflows/codeql-analysis.yaml
@@ -19,16 +19,12 @@ name: codeql-analysis
 
 on:
   push:
-    branches: [ "2.x", "main" ]
+    # These filters apply only to the current branch (`2.x`) and new branches cut from it:
+    # only `release/2*` branches automatically inherit this workflow.
+    branches:
+      - "2.x"
+      - "release/2*"
   pull_request:
-    branches: [ "2.x", "main" ]
-    types:
-      # Standard types
-      - opened
-      - synchronize
-      - reopened
-      # Used in Dependabot PRs to retrigger required workflows
-      - ready_for_review
   schedule:
     - cron: '32 12 * * 5'