diff --git a/apps/dokploy/package.json b/apps/dokploy/package.json
index 66b25a93d49..7b50064f8e3 100644
--- a/apps/dokploy/package.json
+++ b/apps/dokploy/package.json
@@ -141,7 +141,7 @@
 		"stripe": "17.2.1",
 		"superjson": "^2.2.6",
 		"swagger-ui-react": "^5.33.1",
-		"tailwind-merge": "^2.6.1",
+		"tailwind-merge": "^3.7.0",
 		"tailwindcss-animate": "^1.0.7",
 		"toml": "5.0.0",
 		"tw-animate-css": "^1.4.0",
diff --git a/bun.lock b/bun.lock
index 860b60a52ec..73c17626869 100644
--- a/bun.lock
+++ b/bun.lock
@@ -143,7 +143,7 @@
         "stripe": "17.2.1",
         "superjson": "^2.2.6",
         "swagger-ui-react": "^5.33.1",
-        "tailwind-merge": "^2.6.1",
+        "tailwind-merge": "^3.7.0",
         "tailwindcss-animate": "^1.0.7",
         "toml": "5.0.0",
         "tw-animate-css": "^1.4.0",
@@ -3150,7 +3150,7 @@
 
     "systeminformation": ["systeminformation@5.33.15", "", { "os": "!aix", "bin": { "systeminformation": "lib/cli.js" } }, "sha512-s5RloL0F7xhN0ZjfHtLGnbf7EW74EI0N8NFL+1xR7Oxz9QA33obNZsl7lyfnJOhN04E/kGFPoJPlvY7TZ5fzmw=="],
 
-    "tailwind-merge": ["tailwind-merge@2.6.1", "", {}, "sha512-Oo6tHdpZsGpkKG88HJ8RR1rg/RdnEkQEfMoEk2x1XRI3F1AxeU+ijRXpiVUF4UbLfcxxRGw6TbUINKYdWVsQTQ=="],
+    "tailwind-merge": ["tailwind-merge@3.7.0", "", {}, "sha512-XPPUyAc+cvspz3lHTcR/QgPfW2A0lv/xQNIjX3HGhLR+Nq2lHaLq5MtTesHn8GUr3W3DguT2KT5x3NVgRtYwmA=="],
 
     "tailwindcss": ["tailwindcss@4.3.3", "", {}, "sha512-gOhV3P7ufE62QDGg1zVaTgCR+EtPv92k2nIhVcVKcLmxT1sUBsQGhnZj175j+MqRt4zLF7ic+sCYjfhxMxj7YQ=="],