diff --git a/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap b/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
index f1223e0f2..a2c4a38a1 100644
--- a/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
+++ b/src/assets/__tests__/__snapshots__/assets.snapshot.test.ts.snap
@@ -904,7 +904,7 @@ description = "MCP Server demonstrating HTTP tool patterns"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "mcp[cli] >= 1.2.0",
+    "mcp[cli] ~= 1.24.0",
     "httpx >= 0.27.0",
     "opentelemetry-distro",
     "opentelemetry-exporter-otlp",
@@ -4780,8 +4780,8 @@ dependencies = [
     "aws-opentelemetry-distro",
     "opentelemetry-instrumentation-langchain >= 0.59.0",
     "langgraph >= 1.0.2",
-    "mcp >= 1.19.0",
-    "langchain-mcp-adapters >= 0.2.0",
+    "mcp ~= 1.24.0",
+    "langchain-mcp-adapters >= 0.3.1",
     "langchain >= 1.0.3",
     "bedrock-agentcore >= 1.8.0",
     "botocore[crt] >= 1.35.0",
@@ -6437,7 +6437,7 @@ dependencies = [
     "bedrock-agentcore >= 1.9.1",
     "botocore[crt] >= 1.35.0",
     {{#if (eq modelProvider "Gemini")}}"google-genai >= 1.0.0",
-    {{/if}}"mcp >= 1.19.0",
+    {{/if}}"mcp ~= 1.24.0",
     {{#if (eq modelProvider "OpenAI")}}"openai >= 1.0.0",
     {{/if}}{{#if (eq modelProvider "LiteLLM")}}"litellm >= 1.0.0",
     {{/if}}{{#if bedrockMantle}}"openai >= 1.0.0",
@@ -7190,7 +7190,7 @@ description = "AgentCore MCP Server"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "mcp >= 1.19.0",
+    "mcp ~= 1.24.0",
 ]
 
 [tool.hatch.build.targets.wheel]
diff --git a/src/assets/mcp/python/pyproject.toml b/src/assets/mcp/python/pyproject.toml
index 93baeabb7..c454b2b13 100644
--- a/src/assets/mcp/python/pyproject.toml
+++ b/src/assets/mcp/python/pyproject.toml
@@ -9,7 +9,7 @@ description = "MCP Server demonstrating HTTP tool patterns"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "mcp[cli] >= 1.2.0",
+    "mcp[cli] ~= 1.24.0",
     "httpx >= 0.27.0",
     "opentelemetry-distro",
     "opentelemetry-exporter-otlp",
diff --git a/src/assets/python/http/langchain_langgraph/base/pyproject.toml b/src/assets/python/http/langchain_langgraph/base/pyproject.toml
index 4be46c458..3dbf71645 100644
--- a/src/assets/python/http/langchain_langgraph/base/pyproject.toml
+++ b/src/assets/python/http/langchain_langgraph/base/pyproject.toml
@@ -12,8 +12,8 @@ dependencies = [
     "aws-opentelemetry-distro",
     "opentelemetry-instrumentation-langchain >= 0.59.0",
     "langgraph >= 1.0.2",
-    "mcp >= 1.19.0",
-    "langchain-mcp-adapters >= 0.2.0",
+    "mcp ~= 1.24.0",
+    "langchain-mcp-adapters >= 0.3.1",
     "langchain >= 1.0.3",
     "bedrock-agentcore >= 1.8.0",
     "botocore[crt] >= 1.35.0",
diff --git a/src/assets/python/http/strands/base/pyproject.toml b/src/assets/python/http/strands/base/pyproject.toml
index 3679cbebd..d33416e7e 100644
--- a/src/assets/python/http/strands/base/pyproject.toml
+++ b/src/assets/python/http/strands/base/pyproject.toml
@@ -14,7 +14,7 @@ dependencies = [
     "bedrock-agentcore >= 1.9.1",
     "botocore[crt] >= 1.35.0",
     {{#if (eq modelProvider "Gemini")}}"google-genai >= 1.0.0",
-    {{/if}}"mcp >= 1.19.0",
+    {{/if}}"mcp ~= 1.24.0",
     {{#if (eq modelProvider "OpenAI")}}"openai >= 1.0.0",
     {{/if}}{{#if (eq modelProvider "LiteLLM")}}"litellm >= 1.0.0",
     {{/if}}{{#if bedrockMantle}}"openai >= 1.0.0",
diff --git a/src/assets/python/mcp/standalone/base/pyproject.toml b/src/assets/python/mcp/standalone/base/pyproject.toml
index 824f612c6..791ce25ed 100644
--- a/src/assets/python/mcp/standalone/base/pyproject.toml
+++ b/src/assets/python/mcp/standalone/base/pyproject.toml
@@ -9,7 +9,7 @@ description = "AgentCore MCP Server"
 readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
-    "mcp >= 1.19.0",
+    "mcp ~= 1.24.0",
 ]
 
 [tool.hatch.build.targets.wheel]
diff --git a/src/cli/templates/__tests__/multi-gateway-collision.test.ts b/src/cli/templates/__tests__/multi-gateway-collision.test.ts
index 45ef08027..92e942df4 100644
--- a/src/cli/templates/__tests__/multi-gateway-collision.test.ts
+++ b/src/cli/templates/__tests__/multi-gateway-collision.test.ts
@@ -136,8 +136,8 @@ describe('Multi-gateway tool-name collision fix', () => {
         hasGateway: false,
         modelProvider: 'Bedrock',
       });
-      expect(withGw).toContain('langchain-mcp-adapters >= 0.2.0');
-      expect(noGw).toContain('langchain-mcp-adapters >= 0.2.0');
+      expect(withGw).toContain('langchain-mcp-adapters >= 0.3.1');
+      expect(noGw).toContain('langchain-mcp-adapters >= 0.3.1');
       expect(noGw).not.toContain('0.1.11');
     });
   });