diff --git a/apps/web/package.json b/apps/web/package.json
index 2a597ac..882383c 100644
--- a/apps/web/package.json
+++ b/apps/web/package.json
@@ -27,7 +27,7 @@
     "react-dom": "^19.0.0",
     "react-i18next": "^17.0.8",
     "react-router-dom": "^7.18.1",
-    "tailwind-merge": "^2.6.0"
+    "tailwind-merge": "^3.6.0"
   },
   "devDependencies": {
     "@tailwindcss/vite": "^4.0.0",
diff --git a/package-lock.json b/package-lock.json
index 0ab12da..3dffe6f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "vitest": "^2.1.0"
       },
       "engines": {
-        "node": ">=20"
+        "node": ">=22"
       }
     },
     "apps/api": {
@@ -89,7 +89,7 @@
         "react-dom": "^19.0.0",
         "react-i18next": "^17.0.8",
         "react-router-dom": "^7.18.1",
-        "tailwind-merge": "^2.6.0"
+        "tailwind-merge": "^3.6.0"
       },
       "devDependencies": {
         "@tailwindcss/vite": "^4.0.0",
@@ -12889,9 +12889,9 @@
       "license": "MIT"
     },
     "node_modules/tailwind-merge": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.1.tgz",
-      "integrity": "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ==",
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz",
+      "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==",
       "license": "MIT",
       "funding": {
         "type": "github",