diff --git a/.github/workflows/skipped-unit-tests.yaml b/.github/workflows/skipped-unit-tests.yaml
index ab5adc5fa4e..2fe682091c8 100644
--- a/.github/workflows/skipped-unit-tests.yaml
+++ b/.github/workflows/skipped-unit-tests.yaml
@@ -10,7 +10,6 @@ on:
       - 'packaging/**'
       - '.gitignore'
       - 'appveyor.yml'
-      - '**.sh'
       - 'examples/**'
 
 jobs:
diff --git a/.github/workflows/unit-tests.yaml b/.github/workflows/unit-tests.yaml
index 167a75f578f..7364d54d4ed 100644
--- a/.github/workflows/unit-tests.yaml
+++ b/.github/workflows/unit-tests.yaml
@@ -15,10 +15,13 @@ on:
       - 'packaging/**'
       - '.gitignore'
       - 'appveyor.yml'
-      - '**.sh'
       - 'examples/**'
     branches:
       - master
+      - 3.2
+      - 3.1
+      - 3.0
+      - 2.2
       - 2.1
       - 2.0
       - 1.9
@@ -112,7 +115,6 @@ jobs:
           CC: gcc
           CXX: g++
           FLB_OPT: ${{ matrix.flb_option }}
-          CALYPTIA_FLEET_TOKEN: ${{ secrets.CALYPTIA_FLEET_TOKEN }}
 
   run-aarch64-unit-tests:
     # Ensure for OSS Fluent Bit repo we enable usage of Actuated runners for ARM builds, for forks it should keep existing ubuntu-latest usage.
diff --git a/tests/runtime_shell/custom_calyptia.sh b/tests/runtime_shell/custom_calyptia.sh
index 2094302b236..334a772497e 100755
--- a/tests/runtime_shell/custom_calyptia.sh
+++ b/tests/runtime_shell/custom_calyptia.sh
@@ -27,7 +27,7 @@ test_custom_calyptia_fleet_yaml() {
     fi
 
     # Clean up
-    kill -15 $FLB_PID
+    kill -15 $FLB_PID || true
 }
 
 test_custom_calyptia_fleet_toml() {
@@ -57,7 +57,7 @@ test_custom_calyptia_fleet_toml() {
     fi
 
     # Clean up
-    kill -15 $FLB_PID
+    kill -15 $FLB_PID || true
 }
 
 # The following command launch the unit test