diff --git a/.nvmrc b/.nvmrc
index 4a1f488b6c..2062ac7e5f 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-18.17.1
+22.7.0
diff --git a/.tool-versions b/.tool-versions
index 25806cbfc2..51391e2028 100644
--- a/.tool-versions
+++ b/.tool-versions
@@ -1,2 +1,2 @@
-nodejs 18.20.4
+nodejs 22.7.0
 ruby 2.7.7
diff --git a/docs/Dockerfile b/docs/Dockerfile
index 321752e293..1b20df4331 100644
--- a/docs/Dockerfile
+++ b/docs/Dockerfile
@@ -4,7 +4,7 @@ ARG RAILS_ENV="production"
 ARG NONROOT_UID="1000"
 ARG NONROOT_GID="1000"
 ARG BUNDLER_VERSION="2.3.14"
-ARG NODE_VERSION="18.20.4"
+ARG NODE_VERSION="22.7.0"
 ARG YARN_VERSION="1.22.18"
 ARG ARCH="x64"
 ARG GITHUB_TOKEN
diff --git a/docs/package.json b/docs/package.json
index 5f57d2b696..ca2eaa59c3 100644
--- a/docs/package.json
+++ b/docs/package.json
@@ -68,7 +68,7 @@
     "stylelint": "^13.7.2",
     "stylelint-config-sass-guidelines": "^7.0.0",
     "stylelint-config-standard": "^20.0.0",
-    "webpack": "4.44.2",
+    "webpack": "5.94.0",
     "webpack-dev-server": "^3.11.0"
   }
 }
diff --git a/packages/sage-assets/Dockerfile b/packages/sage-assets/Dockerfile
index 99ec8dcc42..34e5d39b8c 100644
--- a/packages/sage-assets/Dockerfile
+++ b/packages/sage-assets/Dockerfile
@@ -3,7 +3,7 @@ FROM ruby:3.1.2-alpine
 ARG RAILS_ENV="production"
 ARG NONROOT_UID="1000"
 ARG NONROOT_GID="1000"
-ARG NODE_VERSION="18.20.4"
+ARG NODE_VERSION="22.7.0"
 ARG YARN_VERSION="1.22.18"
 ARG ARCH="x64"
 
diff --git a/packages/sage-assets/lib/stylesheets/components/_badge.scss b/packages/sage-assets/lib/stylesheets/components/_badge.scss
index 8ba99691f3..80f26bc86d 100644
--- a/packages/sage-assets/lib/stylesheets/components/_badge.scss
+++ b/packages/sage-assets/lib/stylesheets/components/_badge.scss
@@ -126,7 +126,6 @@ $-badge-statuses: (
       align-items: center;
       position: absolute;
       right: rem(8px);
-      width: rem(22px);
       min-height: rem(22px);
       margin-top: rem(1px);
       border-radius: 0 $-badge-border-radius $-badge-border-radius 0;
diff --git a/packages/sage-react/Dockerfile b/packages/sage-react/Dockerfile
index daf9a0ed42..ba591eec62 100644
--- a/packages/sage-react/Dockerfile
+++ b/packages/sage-react/Dockerfile
@@ -2,7 +2,7 @@ FROM alpine:3.17.0
 
 ARG NONROOT_UID="1000"
 ARG NONROOT_GID="1000"
-ARG NODE_VERSION="18.20.4"
+ARG NODE_VERSION="22.7.0"
 ARG ARCH="x64"
 
 RUN apk add \
diff --git a/yarn.lock b/yarn.lock
index 6f84177ead..0f4c918021 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2849,9 +2849,9 @@
     "@octokit/openapi-types" "^12.11.0"
 
 "@pine-ds/icons@^8.0.0":
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/@pine-ds/icons/-/icons-8.0.0.tgz#d1372984908f8e25eff0f52e9e1fb291b9bcdbdc"
-  integrity sha512-HTOOQj9O5O8xonbvEBTXEzlXIbUC322pu+kuD3Qae8K1RX2QFhNekuV/Ni2KVlhxhfziXV8drhagCk2lCfXB8Q==
+  version "8.1.0"
+  resolved "https://registry.yarnpkg.com/@pine-ds/icons/-/icons-8.1.0.tgz#e9b7ef42bf597ab21ca1146ecb1c34b148663504"
+  integrity sha512-peTUaMz/4zq6e+Is3tbEFs1ybk08JrD4nhTJKp34pP9qIT3HCqsEOwoGNWC3jSUJI55PX391QzGkUQgT/EZP6g==
   dependencies:
     "@stencil/core" "^4.20.0"