diff --git a/.github/actions/setup-test-environment/action.yml b/.github/actions/setup-test-environment/action.yml
index 542610337..81b6d0178 100644
--- a/.github/actions/setup-test-environment/action.yml
+++ b/.github/actions/setup-test-environment/action.yml
@@ -47,7 +47,7 @@ runs:
           # Check if PR is targeting a release branch
           TARGET_BRANCH="${{ github.base_ref }}"
 
-          if [[ "$TARGET_BRANCH" =~ ^release-[0-9]+\.[0-9]+\.x-maint$ ]]; then
+          if [[ "$TARGET_BRANCH" =~ ^release-([0-9]+\.){1,3}[0-9]+$ ]]; then
             echo "PR targets release branch: $TARGET_BRANCH"
             echo "Checking if matching branch exists in llama-stack-client-python..."
 
diff --git a/.github/workflows/backward-compat.yml b/.github/workflows/backward-compat.yml
index 88a3db503..cf91b851e 100644
--- a/.github/workflows/backward-compat.yml
+++ b/.github/workflows/backward-compat.yml
@@ -6,7 +6,9 @@ on:
   pull_request:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
     paths:
       - 'src/llama_stack/core/datatypes.py'
       - 'src/llama_stack/providers/datatypes.py'
diff --git a/.github/workflows/integration-auth-tests.yml b/.github/workflows/integration-auth-tests.yml
index ee9d53f22..4157ead35 100644
--- a/.github/workflows/integration-auth-tests.yml
+++ b/.github/workflows/integration-auth-tests.yml
@@ -6,11 +6,15 @@ on:
   push:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
   pull_request:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
     paths:
       - 'distributions/**'
       - 'src/llama_stack/**'
diff --git a/.github/workflows/integration-sql-store-tests.yml b/.github/workflows/integration-sql-store-tests.yml
index 429357c1f..fae675be3 100644
--- a/.github/workflows/integration-sql-store-tests.yml
+++ b/.github/workflows/integration-sql-store-tests.yml
@@ -6,11 +6,15 @@ on:
   push:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
   pull_request:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
     paths:
       - 'src/llama_stack/providers/utils/sqlstore/**'
       - 'tests/integration/sqlstore/**'
diff --git a/.github/workflows/integration-tests.yml b/.github/workflows/integration-tests.yml
index 9f3ffc769..a9876d06a 100644
--- a/.github/workflows/integration-tests.yml
+++ b/.github/workflows/integration-tests.yml
@@ -6,11 +6,15 @@ on:
   push:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
   pull_request:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
     types: [opened, synchronize, reopened]
     paths:
       - 'src/llama_stack/**'
diff --git a/.github/workflows/integration-vector-io-tests.yml b/.github/workflows/integration-vector-io-tests.yml
index 790c2cf8b..eee7bde70 100644
--- a/.github/workflows/integration-vector-io-tests.yml
+++ b/.github/workflows/integration-vector-io-tests.yml
@@ -6,11 +6,15 @@ on:
   push:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
   pull_request:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
     paths:
       - 'src/llama_stack/**'
       - '!src/llama_stack/ui/**'
diff --git a/.github/workflows/pre-commit.yml b/.github/workflows/pre-commit.yml
index 77a041d8e..049911d8b 100644
--- a/.github/workflows/pre-commit.yml
+++ b/.github/workflows/pre-commit.yml
@@ -7,7 +7,9 @@ on:
   push:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref == 'refs/heads/main' && github.run_id || github.ref }}
diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml
index 881803dbb..7e59e7df4 100644
--- a/.github/workflows/unit-tests.yml
+++ b/.github/workflows/unit-tests.yml
@@ -6,11 +6,15 @@ on:
   push:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
   pull_request:
     branches:
       - main
-      - 'release-[0-9]+.[0-9]+.x-maint'
+      - 'release-[0-9]+.[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+.[0-9]+'
+      - 'release-[0-9]+.[0-9]+'
     paths:
       - 'src/llama_stack/**'
       - '!src/llama_stack/ui/**'