diff --git a/.changeset/two-bats-smoke.md b/.changeset/two-bats-smoke.md
index 3ec3c64d..88f27f8c 100644
--- a/.changeset/two-bats-smoke.md
+++ b/.changeset/two-bats-smoke.md
@@ -37,7 +37,6 @@
 - Add additional binary alias: `task-master-mcp-server` pointing to the same MCP server script
 
 - **Significant improvements to model configuration:**
-  - Increase context window from 64k to 128k tokens (MAX_TOKENS=128000) for handling larger codebases
   - Reduce temperature from 0.4 to 0.2 for more consistent, deterministic outputs
   - Set default model to "claude-3-7-sonnet-20250219" in configuration
   - Update Perplexity model to "sonar-pro" for research operations
diff --git a/.env.example b/.env.example
index 2a44c040..45284a3c 100644
--- a/.env.example
+++ b/.env.example
@@ -5,7 +5,7 @@ PERPLEXITY_API_KEY=your_perplexity_api_key_here     # Format: pplx-...
 # Model Configuration
 MODEL=claude-3-7-sonnet-20250219                    # Recommended models: claude-3-7-sonnet-20250219, claude-3-opus-20240229
 PERPLEXITY_MODEL=sonar-pro                          # Perplexity model for research-backed subtasks
-MAX_TOKENS=128000                                   # Maximum tokens for model responses
+MAX_TOKENS=64000                                    # Maximum tokens for model responses
 TEMPERATURE=0.2                                     # Temperature for model responses (0.0-1.0)
 
 # Logging Configuration
diff --git a/README.md b/README.md
index 6610109c..a9b71e0c 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ MCP (Model Control Protocol) provides the easiest way to get started with Task M
 				"PERPLEXITY_API_KEY": "YOUR_PERPLEXITY_API_KEY_HERE",
 				"MODEL": "claude-3-7-sonnet-20250219",
 				"PERPLEXITY_MODEL": "sonar-pro",
-				"MAX_TOKENS": 128000,
+				"MAX_TOKENS": 64000,
 				"TEMPERATURE": 0.2,
 				"DEFAULT_SUBTASKS": 5,
 				"DEFAULT_PRIORITY": "medium"
diff --git a/docs/tutorial.md b/docs/tutorial.md
index 1dec41ba..64e3ed60 100644
--- a/docs/tutorial.md
+++ b/docs/tutorial.md
@@ -23,7 +23,7 @@ MCP (Model Control Protocol) provides the easiest way to get started with Task M
 				"PERPLEXITY_API_KEY": "YOUR_PERPLEXITY_API_KEY_HERE",
 				"MODEL": "claude-3-7-sonnet-20250219",
 				"PERPLEXITY_MODEL": "sonar-pro",
-				"MAX_TOKENS": 128000,
+				"MAX_TOKENS": 64000,
 				"TEMPERATURE": 0.2,
 				"DEFAULT_SUBTASKS": 5,
 				"DEFAULT_PRIORITY": "medium"
diff --git a/scripts/init.js b/scripts/init.js
index 92505a98..5b88f56e 100755
--- a/scripts/init.js
+++ b/scripts/init.js
@@ -895,12 +895,12 @@ function setupMCPConfiguration(targetDir, projectName) {
 			command: 'npx',
 			args: ['-y', 'task-master-mcp'],
 			env: {
-				ANTHROPIC_API_KEY: '%ANTHROPIC_API_KEY%',
-				PERPLEXITY_API_KEY: '%PERPLEXITY_API_KEY%',
+				ANTHROPIC_API_KEY: 'YOUR_ANTHROPIC_API_KEY',
+				PERPLEXITY_API_KEY: 'YOUR_PERPLEXITY_API_KEY',
 				MODEL: 'claude-3-7-sonnet-20250219',
 				PERPLEXITY_MODEL: 'sonar-pro',
 				MAX_TOKENS: 64000,
-				TEMPERATURE: 0.3,
+				TEMPERATURE: 0.2,
 				DEFAULT_SUBTASKS: 5,
 				DEFAULT_PRIORITY: 'medium'
 			}
diff --git a/tests/fixture/test-tasks.json b/tests/fixture/test-tasks.json
index a1ef13d7..6b99c177 100644
--- a/tests/fixture/test-tasks.json
+++ b/tests/fixture/test-tasks.json
@@ -1,14 +1,14 @@
 {
-	"tasks": [
-		{
-			"id": 1,
-			"dependencies": [],
-			"subtasks": [
-				{
-					"id": 1,
-					"dependencies": []
-				}
-			]
-		}
-	]
-}
+  "tasks": [
+    {
+      "id": 1,
+      "dependencies": [],
+      "subtasks": [
+        {
+          "id": 1,
+          "dependencies": []
+        }
+      ]
+    }
+  ]
+}
\ No newline at end of file
diff --git a/tests/integration/mcp-server/direct-functions.test.js b/tests/integration/mcp-server/direct-functions.test.js
index 3d2b6a14..7a657405 100644
--- a/tests/integration/mcp-server/direct-functions.test.js
+++ b/tests/integration/mcp-server/direct-functions.test.js
@@ -131,7 +131,7 @@ jest.mock('../../../scripts/modules/utils.js', () => ({
 	enableSilentMode: mockEnableSilentMode,
 	disableSilentMode: mockDisableSilentMode,
 	CONFIG: {
-		model: 'claude-3-sonnet-20240229',
+		model: 'claude-3-7-sonnet-20250219',
 		maxTokens: 64000,
 		temperature: 0.2,
 		defaultSubtasks: 5
diff --git a/tests/setup.js b/tests/setup.js
index bf2f421c..f7b62ed0 100644
--- a/tests/setup.js
+++ b/tests/setup.js
@@ -7,10 +7,10 @@
 // Mock environment variables
 process.env.MODEL = 'sonar-pro';
 process.env.MAX_TOKENS = '64000';
-process.env.TEMPERATURE = '0.4';
+process.env.TEMPERATURE = '0.2';
 process.env.DEBUG = 'false';
 process.env.LOG_LEVEL = 'error'; // Set to error to reduce noise in tests
-process.env.DEFAULT_SUBTASKS = '3';
+process.env.DEFAULT_SUBTASKS = '5';
 process.env.DEFAULT_PRIORITY = 'medium';
 process.env.PROJECT_NAME = 'Test Project';
 process.env.PROJECT_VERSION = '1.0.0';