diff --git a/.github/workflows/forester-tests.yml b/.github/workflows/forester-tests.yml
index c7e51d84d..b6387e5bf 100644
--- a/.github/workflows/forester-tests.yml
+++ b/.github/workflows/forester-tests.yml
@@ -1,8 +1,7 @@
 on:
   push:
     branches:
-      - "*"
-      - jorrit/feat-bloomfilter-queues
+      - main
     paths:
       - "forester/**"
       - "photon-api/**"
diff --git a/.github/workflows/js.yml b/.github/workflows/js.yml
index fc4d2aa8a..ff8f3b0f0 100644
--- a/.github/workflows/js.yml
+++ b/.github/workflows/js.yml
@@ -1,8 +1,7 @@
 on:
   push:
     branches:
-      - "*"
-      - jorrit/feat-bloomfilter-queues
+      - main
   pull_request:
     branches:
       - "*"
diff --git a/.github/workflows/light-examples-tests.yml b/.github/workflows/light-examples-tests.yml
index 8c8578645..82a59a9d2 100644
--- a/.github/workflows/light-examples-tests.yml
+++ b/.github/workflows/light-examples-tests.yml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - "*"
+      - main
     paths:
       - "examples/**"
       - "macros/light-sdk-macros/**"
@@ -34,13 +34,9 @@ jobs:
       matrix:
         include:
           - program: token-escrow-test
-            sub-tests: '[
-              "cargo test-sbf -p token-escrow -- --test-threads=1"
-            ]'
-          # - program: name-service-without-macros-test
-          #   sub-tests: '[
-          #     "cargo test-sbf -p name-service-without-macros -- --test-threads=1"
-          #   ]'
+            sub-tests: '["cargo test-sbf -p token-escrow -- --test-threads=1"]'
+          - program: name-service-without-macros-test
+            sub-tests: '["cargo test-sbf -p name-service-without-macros -- --test-threads=1"]'
 
     steps:
       - name: Checkout sources
diff --git a/.github/workflows/light-system-programs-tests.yml b/.github/workflows/light-system-programs-tests.yml
index 6776adb48..f4806e396 100644
--- a/.github/workflows/light-system-programs-tests.yml
+++ b/.github/workflows/light-system-programs-tests.yml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - "*"
+      - main
     paths:
       - "programs/**"
       - "test-programs/**"
@@ -41,33 +41,19 @@ jobs:
       matrix:
         include:
           - program: sdk-test-program
-            sub-tests: '[
-              "cargo-test-sbf -p sdk-test -- --test-threads=1"
-            ]'
+            sub-tests: '["cargo-test-sbf -p sdk-test -- --test-threads=1"]'
           - program: account-compression
-            sub-tests: '[
-              "cargo-test-sbf -p account-compression-test"
-            ]'
+            sub-tests: '["cargo-test-sbf -p account-compression-test"]'
           - program: light-system-program
-            sub-tests: '[
-              "cargo-test-sbf -p system-test -- --test-threads=1"
-            ]'
+            sub-tests: '["cargo-test-sbf -p system-test -- --test-threads=1"]'
           - program: light-registry
-            sub-tests: '[
-              "cargo-test-sbf -p registry-test -- --test-threads=1"
-            ]'
+            sub-tests: '["cargo-test-sbf -p registry-test -- --test-threads=1"]'
           - program: light-compressed-token
-            sub-tests: '[
-              "cargo-test-sbf -p compressed-token-test -- --test-threads=1"
-            ]'
+            sub-tests: '["cargo-test-sbf -p compressed-token-test -- --test-threads=1"]'
           - program: system-cpi-test
-            sub-tests: '[
-              "cargo-test-sbf -p system-cpi-test -- --test-threads=1"
-            ]'
+            sub-tests: '["cargo-test-sbf -p system-cpi-test -- --test-threads=1"]'
           - program: random-e2e-test
-            sub-tests: '[
-              "RUST_MIN_STACK=8388608 cargo-test-sbf -p e2e-test -- --nocapture --test-threads=1"
-            ]'
+            sub-tests: '["RUST_MIN_STACK=8388608 cargo-test-sbf -p e2e-test -- --nocapture --test-threads=1"]'
     steps:
       - name: Checkout sources
         uses: actions/checkout@v4
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 6b4ada933..2bf8de401 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,8 +1,7 @@
 on:
   push:
     branches:
-      - "*"
-      - jorrit/feat-bloomfilter-queues
+      - main  
   pull_request:
     branches:
       - "*"
diff --git a/.github/workflows/prover-test.yml b/.github/workflows/prover-test.yml
index 5ecc9c549..2e74fe429 100644
--- a/.github/workflows/prover-test.yml
+++ b/.github/workflows/prover-test.yml
@@ -2,7 +2,7 @@ name: Test gnark prover
 on:
   push:
     branches:
-      - "*"
+      - main
       - 'release/**'
     paths:
       - "light-prover/**"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 212f7abef..5e4f2934c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - "*"
+      - main
 
 jobs:
   release:
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
index fa197e3f3..4116107be 100644
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@@ -1,7 +1,7 @@
 on:
   push:
     branches:
-      - "*"
+      - main
     paths:
       - ".cargo/**"
       - "**/*.rs"