diff --git a/.claude/settings.json b/.claude/settings.json
index b922c6f..22ee855 100644
--- a/.claude/settings.json
+++ b/.claude/settings.json
@@ -1,13 +1,15 @@
 {
-  "allowedTools": [
-    "Bash(grep:*)",
-    "Bash(rg:*)",
-    "Bash(npx tsc:*)",
-    "Edit",
-    "Bash(task-master *)",
-    "Bash(git commit:*)",
-    "Bash(git add:*)",
-    "Bash(npm run *)",
-    "mcp__task_master_ai__*"
-  ]
+  "permissions": {
+      "allow":[
+        "Bash(grep:*)",
+        "Bash(rg:*)",
+        "Bash(npx tsc:*)",
+        "Edit",
+        "Bash(task-master *)",
+        "Bash(git commit:*)",
+        "Bash(git add:*)",
+        "Bash(npm run *)",
+        "mcp__task_master_ai__*"
+    ]
+  }
 }
diff --git a/.mcp.json b/.mcp.json
new file mode 100644
index 0000000..ddf2a78
--- /dev/null
+++ b/.mcp.json
@@ -0,0 +1,23 @@
+{
+    "mcpServers": {
+      "context7-mcp": {
+        "command": "npx",
+        "args": [
+          "-y",
+          "@smithery/cli@latest",
+          "run",
+          "@upstash/context7-mcp",
+          "--key",
+          "ccc459cf-e7b3-4f27-b6e0-b73784be55dc"
+        ]
+      },
+      "taskmaster-ai": {
+        "command": "npx",
+        "args": [
+          "-y",
+          "--package=task-master-ai",
+          "task-master-ai"
+        ]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/.taskmaster/config.json b/.taskmaster/config.json
index 10d95fd..2406aa2 100644
--- a/.taskmaster/config.json
+++ b/.taskmaster/config.json
@@ -1,32 +1,35 @@
 {
   "models": {
     "main": {
-      "provider": "claude-code",
-      "modelId": "sonnet",
-      "maxTokens": 64000,
+      "provider": "gemini-cli",
+      "modelId": "gemini-2.5-pro",
+      "maxTokens": 65536,
       "temperature": 0.2
     },
     "research": {
-      "provider": "claude-code",
-      "modelId": "opus",
-      "maxTokens": 32000,
+      "provider": "gemini-cli",
+      "modelId": "gemini-2.5-pro",
+      "maxTokens": 65536,
       "temperature": 0.1
     },
     "fallback": {
-      "provider": "claude-code",
-      "modelId": "sonnet",
-      "maxTokens": 64000,
+      "provider": "gemini-cli",
+      "modelId": "gemini-2.5-pro",
+      "maxTokens": 65536,
       "temperature": 0.2
     }
   },
   "global": {
     "logLevel": "info",
     "debug": false,
+    "defaultNumTasks": 10,
     "defaultSubtasks": 5,
     "defaultPriority": "medium",
     "projectName": "Task Master",
     "ollamaBaseURL": "http://localhost:11434/api",
     "bedrockBaseURL": "https://bedrock.us-east-1.amazonaws.com",
+    "responseLanguage": "Korean",
     "userId": "1234567890"
-  }
+  },
+  "claudeCode": {}
 }
\ No newline at end of file