diff --git a/.github/workflows/macosx_cpn.yml b/.github/workflows/macosx_cpn.yml
index e18263897..46df6ffc0 100644
--- a/.github/workflows/macosx_cpn.yml
+++ b/.github/workflows/macosx_cpn.yml
@@ -3,18 +3,22 @@ name: MacOSX Companion
 on:
   push:
     branches:
-    - 'main'
+      - 'main'
+      - '2.5'
+    tags:
+      - v*
     paths:
-    - '.github/workflow/macosx_cpn.yml'
-    - 'companion/**'
-    - 'tools/build-companion-nightly.sh'
+      - '.github/workflow/macosx_cpn.yml'
+      - 'companion/**'
+      - 'tools/build-companion-nightly.sh'
+
   pull_request:
     branches:
-    - 'main'
+      - 'main'
     paths:
-    - '.github/workflow/macosx_cpn.yml'
-    - 'companion/**'
-    - 'tools/build-companion-nightly.sh'
+      - '.github/workflow/macosx_cpn.yml'
+      - 'companion/**'
+      - 'tools/build-companion-nightly.sh'
 
   workflow_dispatch:
 
diff --git a/.github/workflows/win_cpn.yml b/.github/workflows/win_cpn.yml
index 74e16fc2d..257bba59a 100644
--- a/.github/workflows/win_cpn.yml
+++ b/.github/workflows/win_cpn.yml
@@ -3,18 +3,22 @@ name: Windows Companion
 on:
   push:
     branches:
-    - 'main'
+      - 'main'
+      - '2.5'
+    tags:
+      - v*
     paths:
-    - '.github/workflow/win_cpn.yml'
-    - 'companion/**'
-    - 'tools/build-companion-nightly.sh'
+      - '.github/workflow/win_cpn.yml'
+      - 'companion/**'
+      - 'tools/build-companion-nightly.sh'
+
   pull_request:
     branches:
-    - 'main'
+      - 'main'
     paths:
-    - '.github/workflow/win_cpn.yml'
-    - 'companion/**'
-    - 'tools/build-companion-nightly.sh'
+      - '.github/workflow/win_cpn.yml'
+      - 'companion/**'
+      - 'tools/build-companion-nightly.sh'
 
   workflow_dispatch: