diff --git a/.github/workflows/build-check.yaml b/.github/workflows/build-check.yaml
index 2b7b59b68..b8a13d880 100644
--- a/.github/workflows/build-check.yaml
+++ b/.github/workflows/build-check.yaml
@@ -35,13 +35,12 @@ jobs:
 
     - 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
         python3 ./build/tests/modularity.py --pub $Z_FEATURE_PUBLICATION --sub $Z_FEATURE_SUBSCRIPTION --queryable $Z_FEATURE_QUERYABLE --query $Z_FEATURE_QUERY
-      continue-on-error: true
+      timeout-minutes: 5
       env:
         Z_FEATURE_PUBLICATION: ${{ matrix.feature_publication }}
         Z_FEATURE_SUBSCRIPTION: ${{ matrix.feature_subscription }}
@@ -49,6 +48,7 @@ jobs:
         Z_FEATURE_QUERY: ${{ matrix.feature_query }}
     
     - name: Stop docker image
+      if: always()
       run: |
         docker stop zenoh_router
         docker rm zenoh_router
\ No newline at end of file
diff --git a/tests/modularity.py b/tests/modularity.py
index 5be8c5851..cac7c9394 100644
--- a/tests/modularity.py
+++ b/tests/modularity.py
@@ -75,6 +75,7 @@ def pub_and_sub(args):
         # Send "q" command to z_sub to stop it
         z_sub_process.stdin.write("q\n")
         z_sub_process.stdin.flush()
+        time.sleep(1)
 
     # Wait for z_sub to finish
     z_sub_process.wait()