diff --git a/.nvmrc b/.nvmrc
index 6f7f377bf5..209e3ef4b6 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-v16
+20
diff --git a/Dockerfile b/Dockerfile
index 5f5b5149bc..821c47bbe7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 # Frontend build.
-FROM node:16.20.2-buster as nodebuild
+FROM node:20.10.0-buster as nodebuild
 COPY ./frontend ./frontend
 COPY ./tools/install-yarn.sh ./tools/install-yarn.sh
 COPY ./tools/preflight-checks.sh ./tools/preflight-checks.sh
diff --git a/docs/_website/package.json b/docs/_website/package.json
index baea2d9213..96d4fe60cc 100644
--- a/docs/_website/package.json
+++ b/docs/_website/package.json
@@ -56,6 +56,6 @@
     "typescript": "*"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/package.json b/frontend/package.json
index 0a8c12930d..1d725e8717 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -90,7 +90,7 @@
     "webpack-dev-server": "3.11.1"
   },
   "engines": {
-    "node": ">=16.0.0 <17",
+    "node": "<21",
     "yarn": "^1.22.11"
   }
 }
diff --git a/frontend/packages/core/package.json b/frontend/packages/core/package.json
index 4de868a9f2..997fab29cb 100644
--- a/frontend/packages/core/package.json
+++ b/frontend/packages/core/package.json
@@ -71,6 +71,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/packages/data-layout/package.json b/frontend/packages/data-layout/package.json
index e6ffe991cd..4b56888698 100644
--- a/frontend/packages/data-layout/package.json
+++ b/frontend/packages/data-layout/package.json
@@ -36,6 +36,6 @@
     "react-test-renderer": "^17.0.2"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/packages/tools/package.json b/frontend/packages/tools/package.json
index 4e1d77d1a6..78d768db48 100644
--- a/frontend/packages/tools/package.json
+++ b/frontend/packages/tools/package.json
@@ -58,6 +58,6 @@
     "typescript": "^4.2.3"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/packages/wizard/package.json b/frontend/packages/wizard/package.json
index 0bbb02dbd4..c176f7b8af 100644
--- a/frontend/packages/wizard/package.json
+++ b/frontend/packages/wizard/package.json
@@ -38,6 +38,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/audit/package.json b/frontend/workflows/audit/package.json
index d523dc0118..554a984632 100644
--- a/frontend/workflows/audit/package.json
+++ b/frontend/workflows/audit/package.json
@@ -33,7 +33,7 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17",
+    "node": "<21",
     "yarn": "^1.22.5"
   }
 }
diff --git a/frontend/workflows/dynamodb/package.json b/frontend/workflows/dynamodb/package.json
index 40dceab4fd..24af703b2e 100644
--- a/frontend/workflows/dynamodb/package.json
+++ b/frontend/workflows/dynamodb/package.json
@@ -36,7 +36,7 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17",
+    "node": "<21",
     "yarn": "^1.22.5"
   }
 }
diff --git a/frontend/workflows/ec2/package.json b/frontend/workflows/ec2/package.json
index 32d7bbb9d6..05c0783dfa 100644
--- a/frontend/workflows/ec2/package.json
+++ b/frontend/workflows/ec2/package.json
@@ -36,6 +36,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/envoy/package.json b/frontend/workflows/envoy/package.json
index 4ee0752826..8c4675d331 100644
--- a/frontend/workflows/envoy/package.json
+++ b/frontend/workflows/envoy/package.json
@@ -39,6 +39,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/experimentation/package.json b/frontend/workflows/experimentation/package.json
index 2dd0c09424..47d5c7ced1 100644
--- a/frontend/workflows/experimentation/package.json
+++ b/frontend/workflows/experimentation/package.json
@@ -35,6 +35,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/k8s/package.json b/frontend/workflows/k8s/package.json
index 8c9abbfda0..5690bf7e37 100644
--- a/frontend/workflows/k8s/package.json
+++ b/frontend/workflows/k8s/package.json
@@ -40,6 +40,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/kinesis/package.json b/frontend/workflows/kinesis/package.json
index 916b3acc47..bfa8aabe5c 100644
--- a/frontend/workflows/kinesis/package.json
+++ b/frontend/workflows/kinesis/package.json
@@ -38,6 +38,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/projectCatalog/package.json b/frontend/workflows/projectCatalog/package.json
index 7bad2fdbe0..09c4219452 100644
--- a/frontend/workflows/projectCatalog/package.json
+++ b/frontend/workflows/projectCatalog/package.json
@@ -44,7 +44,7 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17",
+    "node": "<21",
     "yarn": "^1.22.5"
   }
 }
diff --git a/frontend/workflows/projectSelector/package.json b/frontend/workflows/projectSelector/package.json
index 2faf8bd44e..15f29c1f78 100644
--- a/frontend/workflows/projectSelector/package.json
+++ b/frontend/workflows/projectSelector/package.json
@@ -31,6 +31,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/redisexperimentation/package.json b/frontend/workflows/redisexperimentation/package.json
index c50f6c8a52..45fcead21b 100644
--- a/frontend/workflows/redisexperimentation/package.json
+++ b/frontend/workflows/redisexperimentation/package.json
@@ -35,6 +35,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/serverexperimentation/package.json b/frontend/workflows/serverexperimentation/package.json
index 10530b31f9..3010e41e38 100644
--- a/frontend/workflows/serverexperimentation/package.json
+++ b/frontend/workflows/serverexperimentation/package.json
@@ -35,6 +35,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/frontend/workflows/sourcecontrol/package.json b/frontend/workflows/sourcecontrol/package.json
index 5e4c458a05..60ca0e449c 100644
--- a/frontend/workflows/sourcecontrol/package.json
+++ b/frontend/workflows/sourcecontrol/package.json
@@ -39,6 +39,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }
diff --git a/tools/scaffolding/templates/gateway/frontend/package.json b/tools/scaffolding/templates/gateway/frontend/package.json
index d91f2ab53a..66855056c8 100644
--- a/tools/scaffolding/templates/gateway/frontend/package.json
+++ b/tools/scaffolding/templates/gateway/frontend/package.json
@@ -51,7 +51,7 @@
     ]
   },
   "engines": {
-    "node": ">=16.0.0 <17",
+    "node": "<21",
     "yarn": "^1.22.11"
   }
 }
diff --git a/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json b/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json
index 6da402e12e..e96141c35a 100644
--- a/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json
+++ b/tools/scaffolding/templates/gateway/frontend/workflows/echo/package.json
@@ -29,6 +29,6 @@
     "@clutch-sh/tools": "^2.0.0-beta"
   },
   "engines": {
-    "node": ">=16.0.0 <17"
+    "node": "<21"
   }
 }