diff --git a/.github/workflows/node.js.yml b/.github/workflows/ci.yml
similarity index 79%
rename from .github/workflows/node.js.yml
rename to .github/workflows/ci.yml
index 214d4ce7..41857266 100644
--- a/.github/workflows/node.js.yml
+++ b/.github/workflows/ci.yml
@@ -1,7 +1,4 @@
-# This workflow will do a clean install of node dependencies, cache/restore them, build the source code and run tests across different versions of node
-# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
-
-name: Node.js CI
+name: CI
 
 on:
   push:
@@ -43,22 +40,27 @@ jobs:
         - ${{ needs.configure.outputs.minimum-version }}
         - stable
         node-version:
-        # See supported Node.js release schedule at https://nodejs.org/en/about/releases/
         - 18.x
         - 20.x
+        jdk-version:
+        - '21'
 
     steps: 
     - uses: actions/checkout@v4
     - uses: actions/setup-java@v4
       with:
         distribution: 'temurin'
-        java-version: '21'
+        java-version: ${{ matrix.jdk-version }}
     - name: Use Node.js ${{ matrix.node-version }}
       uses: actions/setup-node@v4
       with:
         node-version: ${{ matrix.node-version }}
     - name: Install dependencies
       run: npm ci
+    - name: Check code formatting
+      run: npx prettier . --check
+    - name: Run linter
+      run: npx eslint .
     - name: Run tests on VS Code ${{ matrix.vscode-version }}
       run: xvfb-run -a npm test
       env: 
diff --git a/.github/workflows/code-checks.yml b/.github/workflows/code-checks.yml
deleted file mode 100644
index 486351f4..00000000
--- a/.github/workflows/code-checks.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-name: Code Style
-
-on:
-    push:
-      branches: [ master ]
-    pull_request:
-      branches: [ master ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-    - uses: actions/checkout@v4
-    - name: Install dependencies
-      run: npm ci
-    - name: Check code formatting
-      run: npx prettier . --check
-    - name: Run linter
-      run: npx eslint .