diff --git a/.github/workflows/android-play-store.yml b/.github/workflows/android-play-store.yml
index ff3ed0062..991583172 100644
--- a/.github/workflows/android-play-store.yml
+++ b/.github/workflows/android-play-store.yml
@@ -6,6 +6,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/android-play-store.yml
 
 jobs:
   build-aab:
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 88dc3eda3..edd3bd13e 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -6,6 +6,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/android.yml
 
 jobs:
   build-apk:
diff --git a/.github/workflows/check-flutter-submodule.yml b/.github/workflows/check-flutter-submodule.yml
index 5e7d25d41..2f0f04522 100644
--- a/.github/workflows/check-flutter-submodule.yml
+++ b/.github/workflows/check-flutter-submodule.yml
@@ -4,6 +4,7 @@ on:
   push:
     paths:
       - .github/workflows/check-flutter-submodule.yml
+      - submodules/flutter
   schedule:
     # every 2 days at 5:58 am (random time to avoid spikes in GitHub Actions usage)
     - cron: '58 5 */2 * *'
diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml
index 1c4a342ba..c0075c568 100644
--- a/.github/workflows/ios.yml
+++ b/.github/workflows/ios.yml
@@ -9,6 +9,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/ios.yml
 
 jobs:
   build-ios:
diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml
index abd3933e7..a209394d9 100644
--- a/.github/workflows/linux.yml
+++ b/.github/workflows/linux.yml
@@ -6,6 +6,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/linux.yml
 
 jobs:
   build-flutter-app-x86_64:
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index a1ed17216..248c0ea5e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -9,6 +9,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/macos.yml
 
 jobs:
   build-macos:
diff --git a/.github/workflows/onyxsdk_pen_tests.yml b/.github/workflows/onyxsdk_pen_tests.yml
index 61985b785..ca31c5d3a 100644
--- a/.github/workflows/onyxsdk_pen_tests.yml
+++ b/.github/workflows/onyxsdk_pen_tests.yml
@@ -5,9 +5,11 @@ on:
   pull_request:
     paths:
       - 'packages/onyxsdk_pen/**'
+      - .github/workflows/onyxsdk_pen_tests.yml
   push:
     paths:
       - 'packages/onyxsdk_pen/**'
+      - .github/workflows/onyxsdk_pen_tests.yml
 
 jobs:
   run-onyx-tests:
diff --git a/.github/workflows/update-landing-page.yml b/.github/workflows/update-landing-page.yml
index 2ba38d3c7..14498c41e 100644
--- a/.github/workflows/update-landing-page.yml
+++ b/.github/workflows/update-landing-page.yml
@@ -6,6 +6,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/update-landing-page.yml
 
 jobs:
   dispatch:
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
index be705edaa..872069657 100644
--- a/.github/workflows/windows.yml
+++ b/.github/workflows/windows.yml
@@ -6,6 +6,10 @@ on:
   push:
     tags:
       - '**'
+    branches:
+      - '**'
+    paths:
+      - .github/workflows/windows.yml
 
 jobs:
   build-windows: