diff --git a/apps/backend/package.json b/apps/backend/package.json
index 3c026af..926b504 100644
--- a/apps/backend/package.json
+++ b/apps/backend/package.json
@@ -9,8 +9,8 @@
     "build": "tsc",
     "test": "NODE_OPTIONS=\"$NODE_OPTIONS --experimental-vm-modules\" jest --detectOpenHandles",
     "lint:types": "tsc --noEmit",
-    "lint:check": "eslint --max-warnings=0 \"src/**/*.{js,jsx,ts,tsx,json}\"",
-    "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\""
+    "lint:check": "eslint --max-warnings=0",
+    "lint:fix": "eslint --fix"
   },
   "jest": {
     "preset": "@repo/jest-presets/node",
diff --git a/package.json b/package.json
index c618a22..38960f4 100644
--- a/package.json
+++ b/package.json
@@ -16,16 +16,36 @@
     "clean": "turbo run clean",
     "dev": "turbo run dev",
     "test": "turbo run test",
-    "lint:types": "turbo run lint:types",
+    "lint:types": "turbo run lint:types --",
     "lint:check": "turbo run lint:check --",
     "lint:fix": "turbo run lint:fix --",
     "format:check": "prettier --check \"**/*.{ts,tsx,js,css,yaml}\"",
     "format:write": "prettier --write \"**/*.{ts,tsx,js,css,yaml}\""
   },
   "lint-staged": {
-    "*.{js,jsx,ts,tsx}": [
-      "npm run lint:check",
-      "npm run test"
+    "apps/backend/**/*.{js,jsx,ts,tsx}": [
+      "npm run lint:check -w backend"
+    ],
+    "apps/backend/**/*.{ts,tsx}": [
+      "sh -c 'npm run lint:types -w backend'"
+    ],
+    "apps/frontend/**/*.{js,jsx,ts,tsx}": [
+      "npm run lint:check -w frontend"
+    ],
+    "apps/frontend/**/*.{ts,tsx}": [
+      "sh -c 'npm run lint:types -w frontend'"
+    ],
+    "packages/database/**/*.{js,jsx,ts,tsx}": [
+      "npm run lint:check -w @repo/database"
+    ],
+    "packages/database/**/*.{ts,tsx}": [
+      "sh -c 'npm run lint:types -w @repo/database'"
+    ],
+    "packages/ui/**/*.{js,jsx,ts,tsx}": [
+      "npm run lint:check -w @repo/ui"
+    ],
+    "packages/ui/**/*.{ts,tsx}": [
+      "sh -c 'npm run lint:types -w @repo/ui'"
     ],
     "*.{js,jsx,ts,tsx,md,html,css}": [
       "npm run format:check"
diff --git a/packages/database/package.json b/packages/database/package.json
index 40e4d56..2110060 100644
--- a/packages/database/package.json
+++ b/packages/database/package.json
@@ -10,8 +10,8 @@
   "scripts": {
     "dev": "docker compose up",
     "lint:types": "tsc --noEmit",
-    "lint:check": "eslint --max-warnings=0 \"src/**/*.{js,jsx,ts,tsx,json}\"",
-    "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\"",
+    "lint:check": "eslint --max-warnings=0",
+    "lint:fix": "eslint --fix",
     "db:generate": "drizzle-kit generate",
     "db:migrate": "drizzle-kit migrate",
     "db:push": "drizzle-kit push",
diff --git a/packages/ui/package.json b/packages/ui/package.json
index 9b6b415..134bf3b 100644
--- a/packages/ui/package.json
+++ b/packages/ui/package.json
@@ -14,8 +14,8 @@
   "scripts": {
     "ui:add": "npx shadcn@canary add",
     "lint:types": "tsc --noEmit",
-    "lint:check": "eslint --max-warnings=0 \"src/**/*.{js,jsx,ts,tsx,json}\"",
-    "lint:fix": "eslint --fix \"src/**/*.{js,jsx,ts,tsx,json}\""
+    "lint:check": "eslint --max-warnings=0",
+    "lint:fix": "eslint --fix"
   },
   "peerDependencies": {
     "@types/react": ">=18",