diff --git a/libs/base-ui/package.json b/libs/base-ui/package.json
index cc360689215..9618b8963aa 100644
--- a/libs/base-ui/package.json
+++ b/libs/base-ui/package.json
@@ -12,7 +12,7 @@
     "@sprig-technologies/sprig-browser": "^2.29.0",
     "classnames": "^2.3.2",
     "clsx": "^1.2.1",
-    "next": "15.1.9",
+    "next": "^15.5.7",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-intl": "^6.2.1",
diff --git a/package.json b/package.json
index 31b6aa9ac21..886906bfe46 100644
--- a/package.json
+++ b/package.json
@@ -47,7 +47,7 @@
     "eslint": "^8.27.0",
     "eslint-config-airbnb": "^19.0.4",
     "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-next": "15.1.9",
+    "eslint-config-next": "^15.5.7",
     "eslint-config-prettier": "^8.5.0",
     "eslint-formatter-codeframe": "^7.32.1",
     "eslint-import-resolver-typescript": "^3.5.2",
@@ -89,14 +89,14 @@
   "dependencies": {
     "@datadog/browser-logs": "^5.23.3",
     "@linaria/babel-preset": "^4.4.3",
-    "@next/bundle-analyzer": "^15.1.9",
+    "@next/bundle-analyzer": "^15.5.7",
     "@radix-ui/react-icons": "^1.3.0",
     "@radix-ui/react-select": "^1.2.1",
     "@radix-ui/react-tooltip": "^1.1.2",
     "classnames": "^2.3.2",
     "clsx": "^1.2.1",
     "moment": "^2.29.4",
-    "next": "15.1.9",
+    "next": "^15.5.7",
     "tslib": "^2.3.0"
   },
   "lint-staged": {
diff --git a/yarn.lock b/yarn.lock
index 06f60ac5a94..ac530903bcc 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1768,7 +1768,7 @@ __metadata:
     "@datadog/browser-logs": ^5.23.3
     "@graphql-eslint/eslint-plugin": ^3.10.4
     "@linaria/babel-preset": ^4.4.3
-    "@next/bundle-analyzer": ^15.1.9
+    "@next/bundle-analyzer": ^15.5.7
     "@playwright/test": ^1.53.1
     "@radix-ui/react-icons": ^1.3.0
     "@radix-ui/react-select": ^1.2.1
@@ -1795,7 +1795,7 @@ __metadata:
     eslint: ^8.27.0
     eslint-config-airbnb: ^19.0.4
     eslint-config-airbnb-typescript: ^17.0.0
-    eslint-config-next: 15.1.9
+    eslint-config-next: ^15.5.7
     eslint-config-prettier: ^8.5.0
     eslint-formatter-codeframe: ^7.32.1
     eslint-import-resolver-typescript: ^3.5.2
@@ -1815,7 +1815,7 @@ __metadata:
     jest-environment-jsdom: ^29.4.1
     lint-staged: ">=10"
     moment: ^2.29.4
-    next: 15.1.9
+    next: ^15.5.7
     pinst: ">=2"
     prettier: ^2.7.1
     react: ^18.2.0
@@ -5533,19 +5533,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/bundle-analyzer@npm:^15.1.9":
-  version: 15.5.7
-  resolution: "@next/bundle-analyzer@npm:15.5.7"
+"@next/bundle-analyzer@npm:^15.5.7":
+  version: 15.5.10
+  resolution: "@next/bundle-analyzer@npm:15.5.10"
   dependencies:
     webpack-bundle-analyzer: 4.10.1
-  checksum: be3e3ab15679762117756b39a01f32f29fac34a7fb514997928ca226a48ec84ccd31029ebcf1df5cae0e91a9e384e5bb8d8ebe522161bd1fb69484e0c9ba204b
-  languageName: node
-  linkType: hard
-
-"@next/env@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/env@npm:15.1.9"
-  checksum: 40313d1acdcef7309b6105b8bf0d036b9150d33237460023426cd5dc9d3774fc98c1e6bd9541e64b33fa62c2d5457d4c22625bf1a6a11059274308577a7c9dac
+  checksum: 416a992e35de9440ec66f341ea79fdacce446b918132f300e10f8362f7daa19b41c1a0f48ce67ac1ff32fad25e7016a6e48f12506b462c6dd7643aaf0ae8d641
   languageName: node
   linkType: hard
 
@@ -5565,19 +5558,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/eslint-plugin-next@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/eslint-plugin-next@npm:15.1.9"
+"@next/eslint-plugin-next@npm:15.5.10":
+  version: 15.5.10
+  resolution: "@next/eslint-plugin-next@npm:15.5.10"
   dependencies:
     fast-glob: 3.3.1
-  checksum: 8f9de0e33a041fda07e8f8d5c75146cdaf9f22c4f9b2b0a4ab10c90992e3e166c7e0c48cb53899d6dc082c6aba960f31135b50262de3c3c113a1338a36405e49
-  languageName: node
-  linkType: hard
-
-"@next/swc-darwin-arm64@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-darwin-arm64@npm:15.1.9"
-  conditions: os=darwin & cpu=arm64
+  checksum: 8b5cfe39b277f392e5e3a364b73c293e8ed34bd5feb8b9005b41a95a2803aadd9032ee1ffa213fb4196b9764b87dd9bf57f23d93dd9571d540b9fc2aba53d248
   languageName: node
   linkType: hard
 
@@ -5588,13 +5574,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-darwin-x64@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-darwin-x64@npm:15.1.9"
-  conditions: os=darwin & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@next/swc-darwin-x64@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-darwin-x64@npm:15.5.7"
@@ -5602,13 +5581,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-gnu@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-linux-arm64-gnu@npm:15.1.9"
-  conditions: os=linux & cpu=arm64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@next/swc-linux-arm64-gnu@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-linux-arm64-gnu@npm:15.5.7"
@@ -5616,13 +5588,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-linux-arm64-musl@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-linux-arm64-musl@npm:15.1.9"
-  conditions: os=linux & cpu=arm64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@next/swc-linux-arm64-musl@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-linux-arm64-musl@npm:15.5.7"
@@ -5630,13 +5595,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-gnu@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-linux-x64-gnu@npm:15.1.9"
-  conditions: os=linux & cpu=x64 & libc=glibc
-  languageName: node
-  linkType: hard
-
 "@next/swc-linux-x64-gnu@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-linux-x64-gnu@npm:15.5.7"
@@ -5644,13 +5602,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-linux-x64-musl@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-linux-x64-musl@npm:15.1.9"
-  conditions: os=linux & cpu=x64 & libc=musl
-  languageName: node
-  linkType: hard
-
 "@next/swc-linux-x64-musl@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-linux-x64-musl@npm:15.5.7"
@@ -5658,13 +5609,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-win32-arm64-msvc@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-win32-arm64-msvc@npm:15.1.9"
-  conditions: os=win32 & cpu=arm64
-  languageName: node
-  linkType: hard
-
 "@next/swc-win32-arm64-msvc@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-win32-arm64-msvc@npm:15.5.7"
@@ -5672,13 +5616,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@next/swc-win32-x64-msvc@npm:15.1.9":
-  version: 15.1.9
-  resolution: "@next/swc-win32-x64-msvc@npm:15.1.9"
-  conditions: os=win32 & cpu=x64
-  languageName: node
-  linkType: hard
-
 "@next/swc-win32-x64-msvc@npm:15.5.7":
   version: 15.5.7
   resolution: "@next/swc-win32-x64-msvc@npm:15.5.7"
@@ -8280,7 +8217,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@swc/counter@npm:0.1.3, @swc/counter@npm:^0.1.3":
+"@swc/counter@npm:^0.1.3":
   version: 0.1.3
   resolution: "@swc/counter@npm:0.1.3"
   checksum: df8f9cfba9904d3d60f511664c70d23bb323b3a0803ec9890f60133954173047ba9bdeabce28cd70ba89ccd3fd6c71c7b0bd58be85f611e1ffbe5d5c18616598
@@ -10684,7 +10621,7 @@ __metadata:
     "@sprig-technologies/sprig-browser": ^2.29.0
     classnames: ^2.3.2
     clsx: ^1.2.1
-    next: 15.1.9
+    next: ^15.5.7
     react: ^18.2.0
     react-dom: ^18.2.0
     react-intl: ^6.2.1
@@ -10928,7 +10865,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"busboy@npm:1.6.0, busboy@npm:^1.6.0":
+"busboy@npm:^1.6.0":
   version: 1.6.0
   resolution: "busboy@npm:1.6.0"
   dependencies:
@@ -13152,11 +13089,11 @@ __metadata:
   languageName: node
   linkType: hard
 
-"eslint-config-next@npm:15.1.9":
-  version: 15.1.9
-  resolution: "eslint-config-next@npm:15.1.9"
+"eslint-config-next@npm:^15.1.6":
+  version: 15.1.7
+  resolution: "eslint-config-next@npm:15.1.7"
   dependencies:
-    "@next/eslint-plugin-next": 15.1.9
+    "@next/eslint-plugin-next": 15.1.7
     "@rushstack/eslint-patch": ^1.10.3
     "@typescript-eslint/eslint-plugin": ^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0
     "@typescript-eslint/parser": ^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -13172,15 +13109,15 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 49c32a8f4bb025a4b3f09ec3833d4cfa78bf8b8e9b4e9aa7aa2c2961e2f80928936b1a6c524c7e7600c7f0e58adef250e77b7972994036b13ffd2ce324af89e1
+  checksum: 54a5facbd4c9bf473bdb29416036bfe508d198de223cad05763d5708d0d1f2a7cdab984796db6e8d187568831436c7a4fd1657f12c938a05d55944db78af14fe
   languageName: node
   linkType: hard
 
-"eslint-config-next@npm:^15.1.6":
-  version: 15.1.7
-  resolution: "eslint-config-next@npm:15.1.7"
+"eslint-config-next@npm:^15.5.7":
+  version: 15.5.10
+  resolution: "eslint-config-next@npm:15.5.10"
   dependencies:
-    "@next/eslint-plugin-next": 15.1.7
+    "@next/eslint-plugin-next": 15.5.10
     "@rushstack/eslint-patch": ^1.10.3
     "@typescript-eslint/eslint-plugin": ^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0
     "@typescript-eslint/parser": ^5.4.2 || ^6.0.0 || ^7.0.0 || ^8.0.0
@@ -13196,7 +13133,7 @@ __metadata:
   peerDependenciesMeta:
     typescript:
       optional: true
-  checksum: 54a5facbd4c9bf473bdb29416036bfe508d198de223cad05763d5708d0d1f2a7cdab984796db6e8d187568831436c7a4fd1657f12c938a05d55944db78af14fe
+  checksum: c3b5db4f683030adcda40386fffb3c707849ba63abe1f985767718a65015666836730b1722f7662b43f6c4212e5e6d50bfa4dfe47931c43a0841f90c03eb0119
   languageName: node
   linkType: hard
 
@@ -17807,67 +17744,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"next@npm:15.1.9":
-  version: 15.1.9
-  resolution: "next@npm:15.1.9"
-  dependencies:
-    "@next/env": 15.1.9
-    "@next/swc-darwin-arm64": 15.1.9
-    "@next/swc-darwin-x64": 15.1.9
-    "@next/swc-linux-arm64-gnu": 15.1.9
-    "@next/swc-linux-arm64-musl": 15.1.9
-    "@next/swc-linux-x64-gnu": 15.1.9
-    "@next/swc-linux-x64-musl": 15.1.9
-    "@next/swc-win32-arm64-msvc": 15.1.9
-    "@next/swc-win32-x64-msvc": 15.1.9
-    "@swc/counter": 0.1.3
-    "@swc/helpers": 0.5.15
-    busboy: 1.6.0
-    caniuse-lite: ^1.0.30001579
-    postcss: 8.4.31
-    sharp: ^0.33.5
-    styled-jsx: 5.1.6
-  peerDependencies:
-    "@opentelemetry/api": ^1.1.0
-    "@playwright/test": ^1.41.2
-    babel-plugin-react-compiler: "*"
-    react: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
-    react-dom: ^18.2.0 || 19.0.0-rc-de68d2f4-20241204 || ^19.0.0
-    sass: ^1.3.0
-  dependenciesMeta:
-    "@next/swc-darwin-arm64":
-      optional: true
-    "@next/swc-darwin-x64":
-      optional: true
-    "@next/swc-linux-arm64-gnu":
-      optional: true
-    "@next/swc-linux-arm64-musl":
-      optional: true
-    "@next/swc-linux-x64-gnu":
-      optional: true
-    "@next/swc-linux-x64-musl":
-      optional: true
-    "@next/swc-win32-arm64-msvc":
-      optional: true
-    "@next/swc-win32-x64-msvc":
-      optional: true
-    sharp:
-      optional: true
-  peerDependenciesMeta:
-    "@opentelemetry/api":
-      optional: true
-    "@playwright/test":
-      optional: true
-    babel-plugin-react-compiler:
-      optional: true
-    sass:
-      optional: true
-  bin:
-    next: dist/bin/next
-  checksum: f598a054689f574438bbe5fbe57daa7a18be3c402a7d96980feaa11a7e08d25f8cfd52410f561c824d02e1f4784f3802ad7d78345f157d61fc2bbb1f74486d1a
-  languageName: node
-  linkType: hard
-
 "next@npm:^15.5.7":
   version: 15.5.7
   resolution: "next@npm:15.5.7"
@@ -20761,7 +20637,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"sharp@npm:^0.33.4, sharp@npm:^0.33.5":
+"sharp@npm:^0.33.4":
   version: 0.33.5
   resolution: "sharp@npm:0.33.5"
   dependencies: