diff --git a/agents/matmaster_agent/sub_agents/structure_search_agent/agent.py b/agents/matmaster_agent/sub_agents/structure_search_agent/agent.py
index c4db306f..5b1cd7a7 100644
--- a/agents/matmaster_agent/sub_agents/structure_search_agent/agent.py
+++ b/agents/matmaster_agent/sub_agents/structure_search_agent/agent.py
@@ -2,13 +2,14 @@
 from google.adk.agents import BaseAgent
 from google.adk.tools.mcp_tool.mcp_session_manager import StreamableHTTPServerParams
 
-from agents.matmaster_agent.constant import LOCAL_EXECUTOR, BohriumStorge
 from agents.matmaster_agent.core_agents.public_agents.sync_agent import (
     BaseSyncAgentWithToolValidator,
 )
 from agents.matmaster_agent.sub_agents.MrDice_agent.constant import MrDice_Agent_Name
 from agents.matmaster_agent.sub_agents.structure_search_agent.constant import (
     STRUCTURE_SEARCH_AGENT_NAME,
+    STRUCTURE_SEARCH_EXECUTOR,
+    STRUCTURE_SEARCH_STORAGE,
     STRUCTURE_SEARCH_URL,
 )
 
@@ -17,8 +18,8 @@
 )
 structure_search_toolset = CalculationMCPToolset(
     connection_params=mcp_params,
-    storage=BohriumStorge,
-    executor=LOCAL_EXECUTOR,
+    storage=STRUCTURE_SEARCH_STORAGE,
+    executor=STRUCTURE_SEARCH_EXECUTOR,
 )
 
 
diff --git a/agents/matmaster_agent/sub_agents/structure_search_agent/constant.py b/agents/matmaster_agent/sub_agents/structure_search_agent/constant.py
index d547888a..3600b857 100644
--- a/agents/matmaster_agent/sub_agents/structure_search_agent/constant.py
+++ b/agents/matmaster_agent/sub_agents/structure_search_agent/constant.py
@@ -1,8 +1,13 @@
-from agents.matmaster_agent.constant import CURRENT_ENV
+import copy
+
+from agents.matmaster_agent.constant import CURRENT_ENV, BohriumStorge, DFlowExecutor
 
 STRUCTURE_SEARCH_AGENT_NAME = 'structure_search_agent'
 
 if CURRENT_ENV in ['test', 'uat']:
-    STRUCTURE_SEARCH_URL = 'http://chvz1424099.bohrium.tech:50001/mcp'
+    STRUCTURE_SEARCH_URL = 'http://chvz1424099.bohrium.tech:50002/mcp'
 else:
-    STRUCTURE_SEARCH_URL = 'http://chvz1424099.bohrium.tech:50002/mcp?token=eGdk3puy52InRnuOuEbJdGACkos34rSOluFbQqL1HDQ'
+    STRUCTURE_SEARCH_URL = 'http://chvz1424099.bohrium.tech:50001/mcp'
+
+STRUCTURE_SEARCH_EXECUTOR = copy.deepcopy(DFlowExecutor)
+STRUCTURE_SEARCH_STORAGE = copy.deepcopy(BohriumStorge)