diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index acb1473fc..5009efe37 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,9 +125,18 @@ jobs:
     uses: waku-org/nwaku/.github/workflows/container-image.yml@master
     secrets: inherit
 
-  js-waku:
+  js-waku-node:
     needs: build-docker-image
-    uses: waku-org/js-waku/.github/workflows/ci.yml@master
+    uses: waku-org/js-waku/.github/workflows/test-node.yml@master
     with:
       nim_wakunode_image: ${{ needs.build-docker-image.outputs.image }}
-      caller: nwaku
+      test_type: node
+      debug: waku*
+
+  js-waku-node-optional:
+    needs: build-docker-image
+    uses: waku-org/js-waku/.github/workflows/test-node.yml@master
+    with:
+      nim_wakunode_image: ${{ needs.build-docker-image.outputs.image }}
+      test_type: node-optional
+      debug: waku*
diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index 16a4092bc..81706c9db 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -95,12 +95,21 @@ jobs:
       image_tag: ${{ needs.tag-name.outputs.tag }}
     secrets: inherit
 
-  js-waku:
+  js-waku-node:
     needs: build-docker-image
-    uses: waku-org/js-waku/.github/workflows/ci.yml@master
+    uses: waku-org/js-waku/.github/workflows/test-node.yml@master
     with:
       nim_wakunode_image: ${{ needs.build-docker-image.outputs.image }}
-      caller: nwaku
+      test_type: node
+      debug: waku*
+
+  js-waku-node-optional:
+    needs: build-docker-image
+    uses: waku-org/js-waku/.github/workflows/test-node.yml@master
+    with:
+      nim_wakunode_image: ${{ needs.build-docker-image.outputs.image }}
+      test_type: node-optional
+      debug: waku*
 
   create-release-candidate:
     runs-on: ubuntu-latest