diff --git a/.github/workflows/test-node.yml b/.github/actions/node/test-node.yml
similarity index 92%
rename from .github/workflows/test-node.yml
rename to .github/actions/node/test-node.yml
index 322f8a5064..3609c3b8c0 100644
--- a/.github/workflows/test-node.yml
+++ b/.github/actions/node/test-node.yml
@@ -9,12 +9,16 @@ on:
       test_type:
         required: true
         type: string
+      debug:
+        required: false
+        type: string
+        default: ''
 
 env:
   NODE_JS: "18"
   RETRY_ATTEMPTS: 3
   WAKU_SERVICE_NODE_PARAMS: ${{ (inputs.test_type == 'go-waku-master') && '--min-relay-peers-to-publish=0' || '' }}
-  DEBUG: ${{ (inputs.test_type == 'go-waku-master' || inputs.test_type == 'nwaku-master') && 'waku*' || '' }}
+  DEBUG: ${{ inputs.test_type }}
 
 jobs:
   node:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6f95fc406c..b74648e60a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -69,28 +69,30 @@ jobs:
       - run: npm run test:browser
 
   node:
-    uses: ./.github/workflows/test-node.yml
+    uses: ./.github/actions/node/test-node.yml
     with:
       nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'statusteam/nim-waku:v0.19.0' }}
       test_type: node
 
   node_optional:
-    uses: ./.github/workflows/test-node.yml
+    uses: ./.github/actions/node/test-node.yml
     with:
       nim_wakunode_image: ${{ inputs.nim_wakunode_image || 'statusteam/nim-waku:v0.19.0' }}
       test_type: node-optional
 
   node_with_go_waku_master:
-    uses: ./.github/workflows/test-node.yml
+    uses: ./.github/actions/node/test-node.yml
     with:
       nim_wakunode_image: statusteam/go-waku:latest
       test_type: go-waku-master
+      debug: waku*
 
   node_with_nwaku_master:
-    uses: ./.github/workflows/test-node.yml
+    uses: ./.github/actions/node/test-node.yml
     with:
       nim_wakunode_image: statusteam/nim-waku:deploy-wakuv2-test
       test_type: nwaku-master
+      debug: waku*
 
   maybe-release:
     name: release