diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b45451f..e8ca64d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -66,8 +66,11 @@ jobs:
     - name: Install dependencies
       run: npm ci
     
-    - name: Run linter
-      run: npm run lint || echo "Linting not configured"
+    - name: Run TypeScript type checking
+      run: npm run type-check
+    
+    - name: Check code formatting with Prettier
+      run: npx prettier --check "src/**/*.{ts,json}" || echo "⚠️ Some files need formatting"
     
     - name: Build backend
       run: npm run build
diff --git a/backend/.eslintrc.json b/backend/.eslintrc.json
index 4969310..0429b8c 100644
--- a/backend/.eslintrc.json
+++ b/backend/.eslintrc.json
@@ -7,11 +7,11 @@
   "extends": [
     "eslint:recommended",
     "@typescript-eslint/recommended",
-    "prettier"
+    "plugin:prettier/recommended"
   ],
   "plugins": ["@typescript-eslint", "prettier"],
   "rules": {
-    "prettier/prettier": "error",
+    "prettier/prettier": "off",
     "no-console": "warn",
     "@typescript-eslint/no-unused-vars": "warn",
     "@typescript-eslint/explicit-function-return-type": "warn"
diff --git a/backend/tsconfig.json b/backend/tsconfig.json
index 2f78baa..d093a5f 100644
--- a/backend/tsconfig.json
+++ b/backend/tsconfig.json
@@ -24,5 +24,5 @@
     "types": ["node", "jest"]
   },
   "include": ["src/**/*"],
-  "exclude": ["node_modules", "dist", "src/**/*.test.ts", "src/**/*.spec.ts", "src/test/**/*"]
+  "exclude": ["node_modules", "dist", "src/**/*.test.ts", "src/**/*.spec.ts", "src/test/**/*", "src/**/__mocks__/**/*"]
 }
\ No newline at end of file