diff --git a/Dockerfile b/Dockerfile
index f7c5d865..e74c637d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 # Largely based on https://github.com/nicbet/docker-phoenix/blob/main/Dockerfile
 
-FROM node:20.12.2-alpine@sha256:7a91aa397f2e2dfbfcdad2e2d72599f374e0b0172be1d86eeb73f1d33f36a4b2 AS node
+FROM node:22.5.1-alpine@sha256:9fcc1a6da2b9eee38638df75c5f826e06e9c79f6a0f97f16ed98fe0ebb0725c0 AS node
 FROM elixir:1.16-otp-26-alpine@sha256:829bebfcdc6fc58c56effc0d77f660de7c902fcf74e785b3175ee3a8f739b3f5 AS setup
 
 
diff --git a/server/phoenix_static_buildpack.config b/server/phoenix_static_buildpack.config
index c2940197..40558d2e 100644
--- a/server/phoenix_static_buildpack.config
+++ b/server/phoenix_static_buildpack.config
@@ -1,3 +1,3 @@
 assets_path=ui
 clean_cache=true
-node_version=20.12.2
\ No newline at end of file
+node_version=22.5.1
\ No newline at end of file
diff --git a/ui/.node-version b/ui/.node-version
index 5802c69c..e561fed0 100644
--- a/ui/.node-version
+++ b/ui/.node-version
@@ -1 +1 @@
-20.12.2
\ No newline at end of file
+22.5.1
\ No newline at end of file
diff --git a/ui/package-lock.json b/ui/package-lock.json
index 8c3f3234..58adc7d1 100644
--- a/ui/package-lock.json
+++ b/ui/package-lock.json
@@ -43,7 +43,7 @@
         "@next/bundle-analyzer": "^14.2.2",
         "@tanstack/react-query-devtools": "^5.32.0",
         "@types/leaflet": "^1.9.12",
-        "@types/node": "20.12.8",
+        "@types/node": "22.0.2",
         "@types/phoenix": "^1.6.4",
         "@types/react": "18.3.1",
         "@types/react-dom": "18.3.0",
@@ -3824,12 +3824,13 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "20.12.8",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-20.12.8.tgz",
-      "integrity": "sha512-NU0rJLJnshZWdE/097cdCBbyW1h4hEg0xpovcoAQYHl8dnEyp/NAOiE45pvc+Bd1Dt+2r94v2eGFpQJ4R7g+2w==",
+      "version": "22.0.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.0.2.tgz",
+      "integrity": "sha512-yPL6DyFwY5PiMVEwymNeqUTKsDczQBJ/5T7W/46RwLU/VH+AA8aT5TZkvBviLKLbbm0hlfftEkGrNzfRk/fofQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "undici-types": "~5.26.4"
+        "undici-types": "~6.11.1"
       }
     },
     "node_modules/@types/parse-json": {
@@ -11339,9 +11340,10 @@
       }
     },
     "node_modules/tslib": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.2.tgz",
-      "integrity": "sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q=="
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz",
+      "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==",
+      "license": "0BSD"
     },
     "node_modules/tsutils": {
       "version": "3.21.0",
@@ -11518,10 +11520,11 @@
       }
     },
     "node_modules/undici-types": {
-      "version": "5.26.5",
-      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-5.26.5.tgz",
-      "integrity": "sha512-JlCMO+ehdEIKqlFxk6IfVoAUVmgz7cU7zD/h9XZ0qzeosSHmUJVOzSQvvYSYWXkFXC+IfLKSIffhv0sVZup6pA==",
-      "dev": true
+      "version": "6.11.1",
+      "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.11.1.tgz",
+      "integrity": "sha512-mIDEX2ek50x0OlRgxryxsenE5XaQD4on5U2inY7RApK3SOJpofyw7uW2AyfMKkhAxXIceo2DeWGVGwyvng1GNQ==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/unixify": {
       "version": "1.0.0",
diff --git a/ui/package.json b/ui/package.json
index 2e4da22f..446f7ef2 100644
--- a/ui/package.json
+++ b/ui/package.json
@@ -51,7 +51,7 @@
     "@next/bundle-analyzer": "^14.2.2",
     "@tanstack/react-query-devtools": "^5.32.0",
     "@types/leaflet": "^1.9.12",
-    "@types/node": "20.12.8",
+    "@types/node": "22.0.2",
     "@types/phoenix": "^1.6.4",
     "@types/react": "18.3.1",
     "@types/react-dom": "18.3.0",