diff --git a/.github/workflows/bedrock-ci.yml b/.github/workflows/bedrock-ci.yml
index 1dfcbeef4..85c615746 100644
--- a/.github/workflows/bedrock-ci.yml
+++ b/.github/workflows/bedrock-ci.yml
@@ -12,30 +12,42 @@ jobs:
     timeout-minutes: 14
 
     steps:
-    - name: Use Node.js 14.x
+    - name: Use Node.js 18.x
       uses: actions/setup-node@v1
       with:
-        node-version: 14.x
-    - uses: actions/checkout@v2
+        node-version: 18.x
+    - name: Checkout node-minecraft-data
+      uses: actions/checkout@v2
       with:
         repository: PrismarineJS/node-minecraft-data
         submodules: recursive
         path: node-mcdata
-    - run: rm -rf minecraft-data
-    - uses: actions/checkout@v2
+    # Erase the submodule for minecraft-data with a checkout of the current minecraft-data repo
+    - run: rm -rf node-mcdata/minecraft-data
+    - name: Checkout minecraft-data
+      uses: actions/checkout@v2
       with:
         path: node-mcdata/minecraft-data
-    - uses: actions/checkout@v2
+    # Now install local node-minecraft-data. Running "prepare" should gen data and types
+    - name: Install minecraft-data
+      run: |
+        cd node-mcdata
+        npm install
+        npm run prepare
+        npm link
+    - name: Checkout bedrock-protocol
+      uses: actions/checkout@v2
       with:
         repository: PrismarineJS/bedrock-protocol
         path: bedrock-protocol
     - run: ls -R .
-    - run: |
+    # I forget the correct install order, do both
+    - name: Install bedrock-protocol
+      run: |
         cd bedrock-protocol
-        npm uninstall minecraft-data
         npm install ../node-mcdata
         npm i
-        cd ../node-mcdata
-        npm run generate:data
-    - run: npm test
+        npm install ../node-mcdata
+    - name: Running bedrock-protocol tests
+      run: npm test
       working-directory: bedrock-protocol
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 79da75392..f84865299 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [14.x]
+        node-version: [18.x]
 
     steps:
     - uses: actions/checkout@v2
@@ -23,7 +23,7 @@ jobs:
         node-version: ${{ matrix.node-version }}
     - run: npm install
       working-directory: tools/js
-    - run: npm build
+    - run: npm run build
       working-directory: tools/js
     - run: npm test
       working-directory: tools/js
diff --git a/.github/workflows/update-helper.yml b/.github/workflows/update-helper.yml
index b55a2c623..96c71b521 100644
--- a/.github/workflows/update-helper.yml
+++ b/.github/workflows/update-helper.yml
@@ -22,4 +22,4 @@ jobs:
     - name: Runs helper
       run: cd .github/helper-bot && node index.js
       env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
\ No newline at end of file
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}