diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml
new file mode 100644
index 000000000..fbf61f995
--- /dev/null
+++ b/.github/workflows/build-check.yaml
@@ -0,0 +1,56 @@
+#
+# Copyright (c) 2022 ZettaScale Technology
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# http://www.eclipse.org/legal/epl-2.0, or the Apache License, Version 2.0
+# which is available at https://www.apache.org/licenses/LICENSE-2.0.
+#
+# SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+#
+# Contributors:
+#   ZettaScale Zenoh Team, <zenoh@zettascale.tech>
+#
+name: build-check
+
+on:
+  push:
+    branches: [ '**' ]
+  pull_request:
+    branches: [ '**' ]
+
+jobs:
+  modular_build:
+    name: Modular build on ubuntu-latest
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        feature_publication: [1, 0]
+        feature_subscription: [1, 0]
+        feature_queryable: [1, 0]
+        feature_query: [1, 0]
+    steps:
+    - name: Checkout code
+      uses: actions/checkout@v4
+
+    - name: Run docker image
+      run: docker run --name zenoh_router --init --net host -d eclipse/zenoh:master
+      continue-on-error: true
+
+    - name: Build project
+      run: |
+        make all
+        ./build/tests/z_modular_test $Z_FEATURE_PUBLICATION $Z_FEATURE_SUBSCRIPTION $Z_FEATURE_QUERYABLE $Z_FEATURE_QUERY
+      continue-on-error: true
+      env:
+        BUILD_TYPE: Debug
+        ZENOH_DEBUG: 3
+        Z_FEATURE_PUBLICATION: ${{ matrix.feature_publication }}
+        Z_FEATURE_SUBSCRIPTION: ${{ matrix.feature_subscription }}
+        Z_FEATURE_QUERYABLE: ${{ matrix.feature_queryable }}
+        Z_FEATURE_QUERY: ${{ matrix.feature_query }}
+    
+    - name: Stop docker image
+      run: |
+        docker stop zenoh_router
+        docker rm zenoh_router
\ No newline at end of file
diff --git a/.github/workflows/build-shared.yaml b/.github/workflows/build-shared.yaml
index 82b998db9..a5b6d2a52 100644
--- a/.github/workflows/build-shared.yaml
+++ b/.github/workflows/build-shared.yaml
@@ -50,39 +50,4 @@ jobs:
       env:
         BUILD_TYPE: Debug
         BUILD_SHARED_LIBS: ON
-        ZENOH_DEBUG: 3
-
-  modular_build:
-    name: Modular build on ubuntu-latest
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        feature_publication: [1, 0]
-        feature_subscription: [1, 0]
-        feature_queryable: [1, 0]
-        feature_query: [1, 0]
-    steps:
-    - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Run docker image
-      run: docker run --name zenoh_router --init --net host -d eclipse/zenoh:master
-      continue-on-error: true
-
-    - name: Build project
-      run: |
-        make all
-        ./build/tests/z_modular_test $Z_FEATURE_PUBLICATION $Z_FEATURE_SUBSCRIPTION $Z_FEATURE_QUERYABLE $Z_FEATURE_QUERY
-      continue-on-error: true
-      env:
-        BUILD_TYPE: Debug
-        ZENOH_DEBUG: 3
-        Z_FEATURE_PUBLICATION: ${{ matrix.feature_publication }}
-        Z_FEATURE_SUBSCRIPTION: ${{ matrix.feature_subscription }}
-        Z_FEATURE_QUERYABLE: ${{ matrix.feature_queryable }}
-        Z_FEATURE_QUERY: ${{ matrix.feature_query }}
-    
-    - name: Stop docker image
-      run: |
-        docker stop zenoh_router
-        docker rm zenoh_router
\ No newline at end of file
+        ZENOH_DEBUG: 3
\ No newline at end of file