diff --git a/.github/actions/prepare/action.yml b/.github/actions/prepare/action.yml
index 3d617edef8cb..cc146a361ae9 100644
--- a/.github/actions/prepare/action.yml
+++ b/.github/actions/prepare/action.yml
@@ -3,13 +3,17 @@ inputs:
     description: 'Whether to minify the bundle'
     required: false
     default: 'false'
+  node-version:
+    description: 'The version of Node.js to use'
+    required: false
+    default: '18.x'
 
 runs:
   using: composite
   steps:
     - uses: actions/setup-node@v3
       with:
-        node-version: 16.x
+        node-version: ${{ inputs.node-version }}
         check-latest: true
 
     #region Build the standard bundle
diff --git a/.github/workflows/e2e-preact-cli-workflow.yml b/.github/workflows/e2e-preact-cli-workflow.yml
index 28cf7970f11b..bb7450505f4a 100644
--- a/.github/workflows/e2e-preact-cli-workflow.yml
+++ b/.github/workflows/e2e-preact-cli-workflow.yml
@@ -20,29 +20,24 @@ jobs:
     - uses: actions/checkout@v3
 
     - uses: ./.github/actions/prepare
+      with:
+        # Remove when Preact CLI supports Node.js 18
+        node-version: 16.x
 
     - name: 'Running the integration test'
       run: |
         source scripts/e2e-setup-ci.sh
-        git clone https://github.com/preactjs-templates/default.git default
-        cd default/template
-        touch yarn.lock
-        echo $(cat package.json | jq '.name = "pnp-test"') > package.json
-        yarn
+
+        yarn dlx preact-cli create default default-app --yarn
+        cd default-app
         yarn build
 
     - name: 'Running the TypeScript integration test'
       run: |
         source scripts/e2e-setup-ci.sh
-        git clone https://github.com/preactjs-templates/typescript.git default
-        cd default/template
-
-        # TODO: Remove once https://github.com/preactjs-templates/typescript/issues/71 is fixed
-        rm -rf tests
 
-        touch yarn.lock
-        echo $(cat package.json | jq '.name = "pnp-test"') > package.json
-        yarn
+        yarn dlx preact-cli create typescript ts-app --yarn
+        cd ts-app
         yarn build
       if: |
         success() || failure()
diff --git a/.github/workflows/integration-workflow.yml b/.github/workflows/integration-workflow.yml
index 330de76bdc9c..1fc2085c6446 100644
--- a/.github/workflows/integration-workflow.yml
+++ b/.github/workflows/integration-workflow.yml
@@ -23,10 +23,9 @@ jobs:
     - run: |
         git fetch --no-tags --unshallow origin HEAD master
 
-    - name: 'Use Node.js 16.x'
-      uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: 16.x
+        node-version: 18.x
 
     - name: 'Check that the Yarn files don''t change on new installs (fix w/ "yarn install")'
       run: |
@@ -151,10 +150,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: 'Use Node.js 16.x'
-      uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: 16.x
+        node-version: 18.x
 
     - name: 'Build bundle & plugins'
       run: |
diff --git a/.github/workflows/release-candidate.yml b/.github/workflows/release-candidate.yml
index 502880076648..14feccc9273b 100644
--- a/.github/workflows/release-candidate.yml
+++ b/.github/workflows/release-candidate.yml
@@ -24,10 +24,9 @@ jobs:
     - name: 'Retrieve all the relevant tags'
       run: git fetch --depth=1 origin +refs/tags/*:refs/tags/*
 
-    - name: 'Use Node.js 16.x'
-      uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: 16.x
+        node-version: 18.x
 
     - name: 'Build a binary for convenience'
       run: |
diff --git a/.github/workflows/sherlock-workflow.yml b/.github/workflows/sherlock-workflow.yml
index 08bb0d3281f8..fde90d0042bd 100644
--- a/.github/workflows/sherlock-workflow.yml
+++ b/.github/workflows/sherlock-workflow.yml
@@ -9,10 +9,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
 
-    - name: 'Install Node'
-      uses: actions/setup-node@v3
+    - uses: actions/setup-node@v3
       with:
-        node-version: 14.x
+        node-version: 18.x
 
     - name: 'Always use the latest sherlock'
       run: |