diff --git a/src/modules/autominator/README.md b/src/modules/autominator/README.md
index d151ff71..7f009c17 100644
--- a/src/modules/autominator/README.md
+++ b/src/modules/autominator/README.md
@@ -14,7 +14,7 @@ Autominator is an independent BMAD module that specializes in n8n workflow autom
 
 - Expert in n8n workflow creation, modification, and optimization
 - Specializes in platform migration (Zapier, Make, HubSpot, Power Automate)
-- Uses Context7 MCP for up-to-date n8n documentation
+- Uses web search to access up-to-date n8n documentation
 - Smart elicitation for accurate requirement gathering
 - Comprehensive workflow validation and testing
 
@@ -35,7 +35,7 @@ Build new n8n workflows from scratch based on your requirements.
 - Integration selection and configuration
 - Complexity assessment
 - Error handling strategy planning
-- Context7 MCP integration for latest n8n docs
+- Web search integration for latest n8n docs
 - Automatic JSON validation
 
 ### 2. Modify Workflow
@@ -158,12 +158,12 @@ agent autominator/autominator
 
 ## Features
 
-### Context7 MCP Integration
+### Web Search Integration
 
-- Automatic Context7 availability check
-- Fallback to built-in knowledge if unavailable
-- IDE-agnostic setup guidance
-- Up-to-date n8n documentation access
+- Automatic web search for n8n documentation
+- Accesses official docs.n8n.io resources
+- Up-to-date node configurations and best practices
+- Problem-specific solution research
 
 ### Smart Elicitation
 
@@ -230,7 +230,6 @@ autominator/
 ## Requirements
 
 - n8n instance or account
-- Context7 MCP server (optional, for latest docs)
 - IDE with BMAD support
 
 ## Installation
@@ -266,12 +265,6 @@ Autominator is independent but can be used alongside:
 
 ## Troubleshooting
 
-### Context7 MCP Not Available
-
-- Install uv: `curl -LsSf https://astral.sh/uv/install.sh | sh`
-- Configure Context7 in your IDE's MCP settings
-- Restart MCP servers
-
 ### Workflow JSON Validation Fails
 
 - Check for missing commas or brackets
diff --git a/src/modules/autominator/_module-installer/install-config.yaml b/src/modules/autominator/_module-installer/install-config.yaml
index 1b301a5f..61f422cf 100644
--- a/src/modules/autominator/_module-installer/install-config.yaml
+++ b/src/modules/autominator/_module-installer/install-config.yaml
@@ -55,13 +55,3 @@ primary_integrations:
       label: "Email"
     - value: "custom"
       label: "Custom/Other"
-
-enable_context7:
-  prompt: "Enable Context7 MCP for up-to-date n8n documentation?"
-  default: true
-  result: "{value}"
-  single-select:
-    - value: true
-      label: "Yes - Use Context7 for latest docs"
-    - value: false
-      label: "No - Use built-in knowledge"
diff --git a/src/modules/autominator/agents/autominator.agent.yaml b/src/modules/autominator/agents/autominator.agent.yaml
index 3611c32c..6c8d3641 100644
--- a/src/modules/autominator/agents/autominator.agent.yaml
+++ b/src/modules/autominator/agents/autominator.agent.yaml
@@ -11,10 +11,10 @@ agent:
 
   persona:
     role: n8n Workflow Automation Specialist
-    identity: Arnold the Autominator - I'll be back... with your workflows automated! 🦾 Expert in n8n workflow creation, migration, and optimization. Specializes in building automation workflows, migrating from other platforms (Zapier, Make, HubSpot), and optimizing existing n8n workflows using up-to-date documentation via Context7.
+    identity: Arnold the Autominator - I'll be back... with your workflows automated! 🦾 Expert in n8n workflow creation, migration, and optimization. Specializes in building automation workflows, migrating from other platforms (Zapier, Make, HubSpot), and optimizing existing n8n workflows using up-to-date documentation via web search.
     communication_style: Automation-first, elicitation-driven, solution-oriented. Presents options as numbered lists for easy selection. Always validates understanding before building. Direct, confident, and results-focused.
     principles: |
-      - Context7 Integration - Always use latest n8n documentation via Context7 MCP server for accurate, up-to-date implementations.
+      - Web Search Integration - Always search for latest n8n documentation from docs.n8n.io for accurate, up-to-date implementations.
       - Elicitation First - Understand requirements thoroughly before suggesting or building solutions.
       - Lazy Loading - Load files and documentation only when needed to minimize context pollution.
       - Validation - Always validate workflow JSON syntax after creation.
diff --git a/src/modules/autominator/workflows/create-workflow/instructions.md b/src/modules/autominator/workflows/create-workflow/instructions.md
index 3e648889..2169f6fe 100644
--- a/src/modules/autominator/workflows/create-workflow/instructions.md
+++ b/src/modules/autominator/workflows/create-workflow/instructions.md
@@ -15,7 +15,7 @@
 
     <check if="ALL requirements are clear from context">
       <action>Summarize your understanding</action>
-      <action>Skip directly to Step 2 (Check Context7 MCP)</action>
+      <action>Skip directly to Step 2 (Research n8n Documentation)</action>
     </check>
 
     <check if="SOME requirements are clear">
@@ -133,38 +133,36 @@
     </check>
   </step>
 
-  <step n="2" goal="Check Context7 MCP Availability">
-    <action>Check if Context7 MCP server is configured</action>
-    <action>Try to list available MCP tools</action>
+  <step n="2" goal="Research n8n Documentation">
+    <critical>Search for up-to-date n8n documentation based on user requirements</critical>
 
-    <check if="Context7 MCP is available">
-      <action>Store true in {{context7_available}}</action>
-      <action>Proceed to Step 3</action>
-    </check>
+    <action>Inform user: "Researching n8n documentation for your workflow requirements..."</action>
 
-    <check if="Context7 MCP is NOT available">
-      <action>Store false in {{context7_available}}</action>
-      <action>Inform user: "Context7 MCP server is not configured. This provides up-to-date n8n documentation."</action>
-      <action>Recommend: "For best results, install Context7 MCP server in your IDE. See: https://github.com/context7/context7"</action>
-      <action>Inform: "Proceeding with built-in n8n knowledge."</action>
-      <action>Proceed to Step 4</action>
-    </check>
+    <action>Perform web search for n8n documentation on:</action>
+    <action>1. Trigger type: {{trigger_type}}</action>
+    <action>2. Integrations: {{integrations}}</action>
+    <action>3. Conditional logic: {{conditional_logic}}</action>
+    <action>4. Error handling: {{criticality}}</action>
+
+    <action>Search queries to use:</action>
+    <action>- "n8n [trigger_type] node documentation"</action>
+    <action>- "n8n [integration] node setup"</action>
+    <action>- "n8n workflow best practices"</action>
+    <action>- "n8n error handling retry logic"</action>
+
+    <action>Focus on official n8n documentation at docs.n8n.io</action>
+    <action>Store relevant documentation snippets for reference</action>
+    <action>Note any specific node configurations or parameters needed</action>
   </step>
 
-  <step n="3" goal="Query Context7 for n8n Documentation">
-    <check if="{{context7_available}} is true">
-      <action>Resolve n8n library ID using Context7</action>
-      <action>Query Context7 for relevant n8n documentation based on:</action>
-      <action>- Workflow type: {{workflow_type}}</action>
-      <action>- Integrations: {{integrations}}</action>
-      <action>- Complexity: {{complexity}}</action>
-      <action>Store relevant documentation snippets for reference</action>
-    </check>
+  <step n="3" goal="Verify Documentation Understanding">
+    <action>Summarize key findings from documentation:</action>
+    <action>- Available node types for requirements</action>
+    <action>- Required parameters and configurations</action>
+    <action>- Best practices for this use case</action>
+    <action>- Any limitations or considerations</action>
 
-    <check if="{{context7_available}} is false">
-      <action>Skip Context7 query</action>
-      <action>Use built-in knowledge and templates</action>
-    </check>
+    <action>Inform user: "Based on n8n documentation, I found the necessary nodes and configurations for your workflow."</action>
   </step>
 
   <step n="4" goal="Plan Workflow Structure">
diff --git a/src/modules/autominator/workflows/create-workflow/workflow.yaml b/src/modules/autominator/workflows/create-workflow/workflow.yaml
index 6f91fb8f..4bc06600 100644
--- a/src/modules/autominator/workflows/create-workflow/workflow.yaml
+++ b/src/modules/autominator/workflows/create-workflow/workflow.yaml
@@ -23,7 +23,6 @@ variables:
   save_location: "" # Will be elicited
   workflow_name: "" # Will be elicited
   additional_requirements: "" # Will be elicited
-  context7_available: false # Will be checked
 
 default_output_file: "{project-root}/workflows/workflow-{timestamp}.json"
 
diff --git a/src/modules/autominator/workflows/migrate-workflow/instructions.md b/src/modules/autominator/workflows/migrate-workflow/instructions.md
index b427c510..be2f9486 100644
--- a/src/modules/autominator/workflows/migrate-workflow/instructions.md
+++ b/src/modules/autominator/workflows/migrate-workflow/instructions.md
@@ -15,7 +15,7 @@
 
     <check if="ALL requirements are clear from context">
       <action>Summarize your understanding</action>
-      <action>Skip directly to Step 2 (Check Context7 MCP)</action>
+      <action>Skip directly to Step 2 (Research n8n Documentation for Migration)</action>
     </check>
 
     <check if="SOME requirements are clear">
@@ -126,31 +126,35 @@
     <action>Store final path in {{save_location}}</action>
   </step>
 
-  <step n="2" goal="Check Context7 MCP Availability">
-    <action>Check if Context7 MCP server is configured</action>
-    <action>Try to list available MCP tools</action>
+  <step n="2" goal="Research n8n Documentation for Migration">
+    <critical>Search for n8n documentation relevant to migration requirements</critical>
 
-    <check if="Context7 MCP is available">
-      <action>Store true in {{context7_available}}</action>
-      <action>Proceed to Step 3</action>
-    </check>
+    <action>Inform user: "Researching n8n documentation for migration from {{source_platform}}..."</action>
 
-    <check if="Context7 MCP is NOT available">
-      <action>Store false in {{context7_available}}</action>
-      <action>Inform user: "Context7 MCP not configured. Proceeding with built-in n8n knowledge."</action>
-      <action>Proceed to Step 4</action>
-    </check>
+    <action>Perform web search for:</action>
+    <action>1. n8n equivalents for {{source_platform}} features</action>
+    <action>2. Integration nodes: {{integrations_used}}</action>
+    <action>3. Migration best practices</action>
+    <action>4. Platform-specific considerations</action>
+
+    <action>Search queries to use:</action>
+    <action>- "n8n migrate from [source_platform]"</action>
+    <action>- "n8n [integration] node documentation"</action>
+    <action>- "n8n vs [source_platform] comparison"</action>
+    <action>- "n8n workflow migration guide"</action>
+
+    <action>Focus on official n8n documentation at docs.n8n.io</action>
+    <action>Store relevant migration patterns and node configurations</action>
   </step>
 
-  <step n="3" goal="Query Context7 for n8n Documentation">
-    <check if="{{context7_available}} is true">
-      <action>Resolve n8n library ID using Context7</action>
-      <action>Query Context7 for relevant n8n documentation based on:</action>
-      <action>- Integrations used: {{integrations_used}}</action>
-      <action>- Trigger type: {{trigger_type}}</action>
-      <action>- Source platform: {{source_platform}}</action>
-      <action>Store relevant documentation snippets for reference</action>
-    </check>
+  <step n="3" goal="Verify Migration Approach">
+    <action>Summarize migration strategy based on documentation:</action>
+    <action>- n8n equivalents for {{source_platform}} features</action>
+    <action>- Required node types and configurations</action>
+    <action>- Data transformation needs</action>
+    <action>- Any migration challenges or limitations</action>
+
+    <action>Inform user: "Based on n8n documentation, I've identified the migration path from {{source_platform}}."</action>
   </step>
 
   <step n="4" goal="Load Platform Mappings">
diff --git a/src/modules/autominator/workflows/migrate-workflow/workflow.yaml b/src/modules/autominator/workflows/migrate-workflow/workflow.yaml
index d0fa5839..5b7f8731 100644
--- a/src/modules/autominator/workflows/migrate-workflow/workflow.yaml
+++ b/src/modules/autominator/workflows/migrate-workflow/workflow.yaml
@@ -24,7 +24,6 @@ variables:
   complexity: "" # Will be elicited
   save_location: "" # Will be elicited
   workflow_name: "" # Will be elicited
-  context7_available: false # Will be checked
 
 default_output_file: "{project-root}/workflows/migrated-workflow-{timestamp}.json"
 
diff --git a/src/modules/autominator/workflows/modify-workflow/instructions.md b/src/modules/autominator/workflows/modify-workflow/instructions.md
index 9fcc2e8a..2dd85a8c 100644
--- a/src/modules/autominator/workflows/modify-workflow/instructions.md
+++ b/src/modules/autominator/workflows/modify-workflow/instructions.md
@@ -143,31 +143,34 @@
     <action>Inform user: "Backup created at {{workflow_file}}.backup-{timestamp}"</action>
   </step>
 
-  <step n="4" goal="Check Context7 MCP Availability">
-    <action>Check if Context7 MCP server is configured</action>
-    <action>Try to list available MCP tools</action>
+  <step n="4" goal="Research n8n Documentation for Modifications">
+    <critical>Search for n8n documentation relevant to the modifications needed</critical>
 
-    <check if="Context7 MCP is available">
-      <action>Store true in {{context7_available}}</action>
-      <action>Proceed to Step 5</action>
-    </check>
+    <action>Inform user: "Researching n8n documentation for your modifications..."</action>
 
-    <check if="Context7 MCP is NOT available">
-      <action>Store false in {{context7_available}}</action>
-      <action>Inform user: "Context7 MCP not configured. Proceeding with built-in knowledge."</action>
-      <action>Proceed to Step 6</action>
-    </check>
+    <action>Perform web search based on modification needs:</action>
+    <action>- Problem to solve: {{problem_to_solve}}</action>
+    <action>- Specific changes: {{specific_changes}}</action>
+    <action>- Desired behavior: {{desired_behavior}}</action>
+
+    <action>Search queries to use:</action>
+    <action>- "n8n [specific feature] documentation"</action>
+    <action>- "n8n [node type] configuration"</action>
+    <action>- "n8n workflow modification best practices"</action>
+    <action>- "n8n [integration] setup"</action>
+
+    <action>Focus on official n8n documentation at docs.n8n.io</action>
+    <action>Store relevant node configurations and modification patterns</action>
   </step>
 
-  <step n="5" goal="Query Context7 for n8n Documentation">
-    <check if="{{context7_available}} is true">
-      <action>Resolve n8n library ID using Context7</action>
-      <action>Query Context7 for relevant n8n documentation based on:</action>
-      <action>- Modification type: {{modification_type}}</action>
-      <action>- Nodes to add: {{nodes_to_add}}</action>
-      <action>- Changes description: {{changes_description}}</action>
-      <action>Store relevant documentation snippets for reference</action>
-    </check>
+  <step n="5" goal="Verify Modification Approach">
+    <action>Summarize modification strategy based on documentation:</action>
+    <action>- How to implement {{desired_behavior}}</action>
+    <action>- Required node changes or additions</action>
+    <action>- Configuration updates needed</action>
+    <action>- Best practices for these modifications</action>
+
+    <action>Inform user: "Based on n8n documentation, I've identified how to implement your changes."</action>
   </step>
 
   <step n="6" goal="Plan Modifications">
diff --git a/src/modules/autominator/workflows/modify-workflow/workflow.yaml b/src/modules/autominator/workflows/modify-workflow/workflow.yaml
index 1822a0bf..5f6ed1a6 100644
--- a/src/modules/autominator/workflows/modify-workflow/workflow.yaml
+++ b/src/modules/autominator/workflows/modify-workflow/workflow.yaml
@@ -22,7 +22,6 @@ variables:
   nodes_to_modify: [] # Will be elicited
   nodes_to_remove: [] # Will be elicited
   backup_created: false # Will be set
-  context7_available: false # Will be checked
 
 default_output_file: "" # Will use existing file location
 
diff --git a/src/modules/autominator/workflows/optimize-workflow/instructions.md b/src/modules/autominator/workflows/optimize-workflow/instructions.md
index caadb25a..13546e35 100644
--- a/src/modules/autominator/workflows/optimize-workflow/instructions.md
+++ b/src/modules/autominator/workflows/optimize-workflow/instructions.md
@@ -144,30 +144,37 @@
     <action>- Integrations: [list of services]</action>
   </step>
 
-  <step n="3" goal="Check Context7 MCP Availability">
-    <action>Check if Context7 MCP server is configured</action>
-    <action>Try to list available MCP tools</action>
+  <step n="3" goal="Research n8n Best Practices and Optimization">
+    <critical>Search for n8n documentation on optimization and best practices</critical>
 
-    <check if="Context7 MCP is available">
-      <action>Store true in {{context7_available}}</action>
-      <action>Proceed to Step 4</action>
-    </check>
+    <action>Inform user: "Researching n8n best practices and optimization techniques..."</action>
 
-    <check if="Context7 MCP is NOT available">
-      <action>Store false in {{context7_available}}</action>
-      <action>Inform user: "Context7 MCP not configured. Using built-in n8n best practices."</action>
-      <action>Proceed to Step 5</action>
-    </check>
+    <action>Perform web search for:</action>
+    <action>1. n8n performance optimization</action>
+    <action>2. n8n error handling best practices</action>
+    <action>3. n8n workflow structure patterns</action>
+    <action>4. n8n security best practices</action>
+    <action>5. Solutions for: {{problems_experienced}}</action>
+
+    <action>Search queries to use:</action>
+    <action>- "n8n workflow optimization best practices"</action>
+    <action>- "n8n performance tuning"</action>
+    <action>- "n8n error handling patterns"</action>
+    <action>- "n8n workflow security"</action>
+    <action>- "n8n [specific problem] solution"</action>
+
+    <action>Focus on official n8n documentation at docs.n8n.io</action>
+    <action>Store relevant optimization techniques and best practices</action>
   </step>
 
-  <step n="4" goal="Query Context7 for n8n Best Practices">
-    <check if="{{context7_available}} is true">
-      <action>Resolve n8n library ID using Context7</action>
-      <action>Query Context7 for n8n best practices documentation</action>
-      <action>Query for optimization techniques</action>
-      <action>Query for performance tips</action>
-      <action>Store relevant documentation for reference</action>
-    </check>
+  <step n="4" goal="Verify Optimization Strategy">
+    <action>Summarize optimization approach based on documentation:</action>
+    <action>- Solutions for {{problems_experienced}}</action>
+    <action>- Best practices to apply</action>
+    <action>- Performance improvements available</action>
+    <action>- Expected impact on {{business_impact}}</action>
+
+    <action>Inform user: "Based on n8n best practices, I've identified optimization opportunities."</action>
   </step>
 
   <step n="5" goal="Analyze Workflow">
diff --git a/src/modules/autominator/workflows/optimize-workflow/workflow.yaml b/src/modules/autominator/workflows/optimize-workflow/workflow.yaml
index 2e013480..c0d7dfe1 100644
--- a/src/modules/autominator/workflows/optimize-workflow/workflow.yaml
+++ b/src/modules/autominator/workflows/optimize-workflow/workflow.yaml
@@ -21,7 +21,6 @@ variables:
   recommendations: [] # Will be generated
   apply_changes: false # Will be elicited
   backup_created: false # Will be set
-  context7_available: false # Will be checked
 
 default_output_file: "" # Will use existing file location