diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml
index 229e4e47d..0e69cb97a 100644
--- a/.github/workflows/gradle.yml
+++ b/.github/workflows/gradle.yml
@@ -16,7 +16,8 @@ permissions:
   contents: write
 
 jobs:
-  build:
+  build-java:
+    name: Build Java
     runs-on: ubuntu-latest
 
     env:
@@ -24,47 +25,114 @@ jobs:
       DEFAULT_BRANCH: ${{ github.base_ref || 'master' }}
 
     steps:
-    - name: Setup Java
-      uses: actions/setup-java@v4
-      with:
-        distribution: 'temurin'
-        java-version: 17
-
-    - name: Setup Gradle
-      uses: gradle/actions/setup-gradle@v4
-      with:
-        gradle-version: current
-        dependency-graph: generate-and-submit
-
-    - name: Checkout Clava
-      uses: actions/checkout@v4
-      with:
-        path: clava
-
-    - name: Check if branch exists on lara-framework
-      id: Branch-lara-framework
-      run: git ls-remote --heads https://github.com/specs-feup/lara-framework.git refs/heads/${{ env.BRANCH_NAME }} | wc -l
-
-    - name: Check if branch exists on specs-java-libs
-      id: Branch-specs-java-libs
-      run: git ls-remote --heads https://github.com/specs-feup/specs-java-libs.git refs/heads/${{ env.BRANCH_NAME }} | wc -l
-
-    - name: Checkout lara-framework
-      uses: actions/checkout@v4
-      with:
-        repository: specs-feup/lara-framework
-        path: lara-framework
-        #ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} Disabled until PR is merged
-        ref: "feature/lara-js"
-        
-    - name: Checkout specs-java-libs
-      uses: actions/checkout@v4
-      with:
-        repository: specs-feup/specs-java-libs
-        path: specs-java-libs
-        ref: ${{ steps.Branch-specs-java-libs.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }}
-
-    - name: Build with Gradle
-      run: |
-        cd clava/ClavaWeaver
-        gradle build --no-daemon
+      - name: Setup Java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 17
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: current
+          dependency-graph: generate-and-submit
+
+      - name: Checkout Clava
+        uses: actions/checkout@v4
+        with:
+          path: clava
+
+      - name: Check if branch exists on lara-framework
+        id: Branch-lara-framework
+        run: git ls-remote --heads https://github.com/specs-feup/lara-framework.git refs/heads/${{ env.BRANCH_NAME }} | wc -l
+
+      - name: Check if branch exists on specs-java-libs
+        id: Branch-specs-java-libs
+        run: git ls-remote --heads https://github.com/specs-feup/specs-java-libs.git refs/heads/${{ env.BRANCH_NAME }} | wc -l
+
+      - name: Checkout lara-framework
+        uses: actions/checkout@v4
+        with:
+          repository: specs-feup/lara-framework
+          path: lara-framework
+          #ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} Disabled until PR is merged
+          ref: "feature/lara-js"
+          
+      - name: Checkout specs-java-libs
+        uses: actions/checkout@v4
+        with:
+          repository: specs-feup/specs-java-libs
+          path: specs-java-libs
+          ref: ${{ steps.Branch-specs-java-libs.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }}
+
+      - name: Build with Gradle
+        run: |
+          cd clava/ClavaWeaver
+          gradle build
+
+      - name: Upload ClavaWeaver artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: java-binaries
+          path: clava/ClavaWeaver/build/install/ClavaWeaver
+
+
+  build-js:
+    name: Build JS
+    strategy:
+      matrix:
+        fail-fast: false
+        node-version: ['20.x', '18.x']
+        os: [ubuntu-latest, windows-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: ${{ matrix.node-version }}
+          cache: 'npm'
+
+      - name: Checkout Clava
+        uses: actions/checkout@v4
+        with:
+          path: clava
+
+      - name: Check if branch exists on lara-framework
+        id: Branch-lara-framework
+        run: git ls-remote --heads https://github.com/specs-feup/lara-framework.git refs/heads/${{ env.BRANCH_NAME }} | wc -l
+
+      - name: Checkout lara-framework
+        uses: actions/checkout@v4
+        with:
+          repository: specs-feup/lara-framework
+          path: lara-framework
+          #ref: ${{ steps.Branch-lara-framework.outputs.stdout == '1' && env.BRANCH_NAME || env.DEFAULT_BRANCH }} Disabled until PR is merged
+          ref: "feature/lara-js"
+
+      - name: Setup js workspace
+        run: |
+          echo '{ "name": "SPeCS Workspace", "type": "module", "workspaces": [ "clava/Clava-JS", "lara-framework/Lara-JS" ] }' > package.json
+          npm install
+
+      - name: Build Lara-JS
+        run: |
+          cd lara-framework/Lara-JS
+          npm run build
+
+      - name: Build Clava-JS
+        run: |
+          cd clava/Clava-JS
+          npm run build
+
+      - name: Pull java-binaries
+        uses: actions/download-artifact@v4
+        with:
+          name: java-binaries
+          path: clava/Clava-JS/java-binaries
+
+      - name: Test JS
+        run: |
+          cd clava/Clava-JS
+          npm run test