diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index e441edcffd..175438f494 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -23,12 +23,14 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v3
-      - name: Restore cached node_modules
-        uses: actions/cache@v2
+      - name: Install Node 16
+        uses: actions/setup-node@v3
+        env:
+          FORCE_COLOR: 0 # https://github.com/actions/setup-node/issues/317
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
-      - name: Install missing dependencies
+          node-version: 16
+          cache: 'yarn'
+      - name: Install dependencies
         run: yarn install --prefer-offline --frozen-lockfile
       - name: Run Prettier on web client
         working-directory: web
diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml
index 2aa95e44f9..49bef7cbde 100644
--- a/.github/workflows/format.yml
+++ b/.github/workflows/format.yml
@@ -26,12 +26,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.FORMATTER_ACCESS_TOKEN }}
-      - name: Restore cached node_modules
-        uses: actions/cache@v2
+      - name: Install Node 16
+        uses: actions/setup-node@v3
+        env:
+          FORCE_COLOR: 0 # https://github.com/actions/setup-node/issues/317
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
-      - name: Install missing dependencies
+          node-version: 16
+          cache: 'yarn'
+      - name: Install dependencies
         run: yarn install --prefer-offline --frozen-lockfile
       - name: Run Prettier on web client
         working-directory: web
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 27a5414918..7ebfaa747f 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -26,12 +26,14 @@ jobs:
         uses: actions/checkout@v3
         with:
           token: ${{ secrets.FORMATTER_ACCESS_TOKEN }}
-      - name: Restore cached node_modules
-        uses: actions/cache@v2
+      - name: Install Node 16
+        uses: actions/setup-node@v3
+        env:
+          FORCE_COLOR: 0 # https://github.com/actions/setup-node/issues/317
         with:
-          path: '**/node_modules'
-          key: ${{ runner.os }}-${{ matrix.node-version }}-nodemodules-${{ hashFiles('**/yarn.lock') }}
-      - name: Install missing dependencies
+          node-version: 16
+          cache: 'yarn'
+      - name: Install dependencies
         run: yarn install --prefer-offline --frozen-lockfile
       - name: Run lint script
         run: yarn lint
diff --git a/.github/workflows/merge-main-into-main2.yml b/.github/workflows/merge-main-into-main2.yml
deleted file mode 100644
index 0a8de56f01..0000000000
--- a/.github/workflows/merge-main-into-main2.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-name: Merge main into main2 on every commit
-on:
-  push:
-    branches:
-      - 'main'
-jobs:
-  merge-branch:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@master
-
-      - name: Merge main -> main2
-        uses: devmasx/merge-branch@master
-        with:
-          type: now
-          target_branch: main2
-          github_token: ${{ github.token }}
diff --git a/package.json b/package.json
index 263e330ac6..68eb6e50c4 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {},
   "devDependencies": {
-    "@types/node": "16.11.11",
+    "@types/node": "16.18.3",
     "@typescript-eslint/eslint-plugin": "5.36.0",
     "@typescript-eslint/parser": "5.36.0",
     "concurrently": "6.5.1",
diff --git a/web/package.json b/web/package.json
index 1fbacd34eb..5e717513a8 100644
--- a/web/package.json
+++ b/web/package.json
@@ -83,7 +83,6 @@
     "@tailwindcss/typography": "^0.5.1",
     "@types/d3": "7.4.0",
     "@types/lodash": "4.14.178",
-    "@types/node": "16.11.11",
     "@types/react": "18.0.21",
     "@types/react-dom": "18.0.6",
     "@types/string-similarity": "^4.0.0",
diff --git a/yarn.lock b/yarn.lock
index 5efacf61a5..efe50a23ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3610,10 +3610,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.35.tgz#635b7586086d51fb40de0a2ec9d1014a5283ba4a"
   integrity sha512-vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg==
 
-"@types/node@16.11.11":
-  version "16.11.11"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.11.tgz#6ea7342dfb379ea1210835bada87b3c512120234"
-  integrity sha512-KB0sixD67CeecHC33MYn+eYARkqTheIRNuu97y2XMjR7Wu3XibO1vaY6VBV6O/a89SPI81cEUIYT87UqUWlZNw==
+"@types/node@16.18.3":
+  version "16.18.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.18.3.tgz#d7f7ba828ad9e540270f01ce00d391c54e6e0abc"
+  integrity sha512-jh6m0QUhIRcZpNv7Z/rpN+ZWXOicUUQbSoWks7Htkbb9IjFQj4kzcX/xFCkjstCj5flMsN8FiSvt+q+Tcs4Llg==
 
 "@types/node@^17.0.5":
   version "17.0.38"