diff --git a/.github/workflows/budibase_ci.yml b/.github/workflows/budibase_ci.yml
index 39a79193d3..d6bbf19940 100644
--- a/.github/workflows/budibase_ci.yml
+++ b/.github/workflows/budibase_ci.yml
@@ -38,10 +38,10 @@ jobs:
           submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
       - run: yarn lint
@@ -56,10 +56,10 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
 
@@ -84,7 +84,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: azure/setup-helm@v3
       - run: cd charts/budibase && helm lint .
 
@@ -98,10 +98,10 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
@@ -122,10 +122,10 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test worker
@@ -146,10 +146,10 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test server
@@ -171,10 +171,10 @@ jobs:
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
           fetch-depth: 0
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
       - name: Test
@@ -194,10 +194,10 @@ jobs:
           submodules: ${{ env.IS_OSS_CONTRIBUTOR == 'false' }}
           token: ${{ secrets.PERSONAL_ACCESS_TOKEN || github.token }}
 
-      - name: Use Node.js 18.x
+      - name: Use Node.js 20.x
         uses: actions/setup-node@v3
         with:
-          node-version: 18.x
+          node-version: 20.x
           cache: yarn
       - run: yarn --frozen-lockfile
       - name: Build packages
diff --git a/packages/account-portal b/packages/account-portal
index ab453c693a..2cc5fed3a2 160000
--- a/packages/account-portal
+++ b/packages/account-portal
@@ -1 +1 @@
-Subproject commit ab453c693a14d8e82725ba8d4002e5118ce84f61
+Subproject commit 2cc5fed3a25c31559c46b1545a674f323e7e61d6
diff --git a/packages/pro b/packages/pro
index a5614dab8f..b5485247fe 160000
--- a/packages/pro
+++ b/packages/pro
@@ -1 +1 @@
-Subproject commit a5614dab8fedd37d4b04abfc12543b3de3eb7aa7
+Subproject commit b5485247fe823d85c2a7c3732b23b500c370fca3