diff --git a/samples/github-helper-agent/README.md b/samples/github-helper-agent/README.md
index 3326a88..41d18be 100644
--- a/samples/github-helper-agent/README.md
+++ b/samples/github-helper-agent/README.md
@@ -80,7 +80,7 @@ uv sync
 Set your MCP Remote Server URL as environment variables in `.env`:
 
 ```bash
-UIPATH_MCP_SERVER_URL=https://cloud.uipath.com/account/tenant/mcp_/mcp/folder-key/github-mcp/sse
+UIPATH_MCP_SERVER_URL=https://cloud.uipath.com/account/tenant/agenthub_/mcp/folder-key/github-mcp/sse
 ```
 
 ## Debugging
diff --git a/src/uipath_mcp/_cli/_runtime/_runtime.py b/src/uipath_mcp/_cli/_runtime/_runtime.py
index c61f963..24ab8de 100644
--- a/src/uipath_mcp/_cli/_runtime/_runtime.py
+++ b/src/uipath_mcp/_cli/_runtime/_runtime.py
@@ -72,7 +72,7 @@ async def execute(self) -> Optional[UiPathRuntimeResult]:
             )  # type: ignore
 
             # Set up SignalR client
-            signalr_url = f"{os.environ.get('UIPATH_URL')}/mcp_/wsstunnel?slug={self._server.name}&runtimeId={self._runtime_id}"
+            signalr_url = f"{os.environ.get('UIPATH_URL')}/agenthub_/wsstunnel?slug={self._server.name}&runtimeId={self._runtime_id}"
 
             with tracer.start_as_current_span(self._server.name) as root_span:
                 root_span.set_attribute("runtime_id", self._runtime_id)
@@ -389,7 +389,7 @@ async def _register(self) -> None:
             # Register with UiPath MCP Server
             await self._uipath.api_client.request_async(
                 "POST",
-                f"mcp_/mcp/{self._server.name}/runtime/start?runtimeId={self._runtime_id}",
+                f"agenthub_/mcp/{self._server.name}/runtime/start?runtimeId={self._runtime_id}",
                 json=client_info,
                 headers={"X-UIPATH-FolderKey": folder_key},
             )
@@ -414,7 +414,7 @@ async def _on_session_start_error(self, session_id: str) -> None:
         try:
             response = await self._uipath.api_client.request_async(
                 "POST",
-                f"mcp_/mcp/{self._server.name}/out/message?sessionId={session_id}",
+                f"agenthub_/mcp/{self._server.name}/out/message?sessionId={session_id}",
                 json=JSONRPCResponse(
                     jsonrpc="2.0",
                     id=0,
@@ -480,7 +480,7 @@ async def _on_runtime_abort(self) -> None:
         try:
             response = await self._uipath.api_client.request_async(
                 "POST",
-                f"mcp_/mcp/{self._server.name}/runtime/abort?runtimeId={self._runtime_id}",
+                f"agenthub_/mcp/{self._server.name}/runtime/abort?runtimeId={self._runtime_id}",
             )
             if response.status_code == 202:
                 logger.info(
diff --git a/src/uipath_mcp/_cli/_runtime/_session.py b/src/uipath_mcp/_cli/_runtime/_session.py
index a4ebe43..e35e559 100644
--- a/src/uipath_mcp/_cli/_runtime/_session.py
+++ b/src/uipath_mcp/_cli/_runtime/_session.py
@@ -227,7 +227,7 @@ async def _send_message_internal(
     ) -> None:
         response = await self._uipath.api_client.request_async(
             "POST",
-            f"mcp_/mcp/{self._server_config.name}/out/message?sessionId={self._session_id}&requestId={request_id}",
+            f"agenthub_/mcp/{self._server_config.name}/out/message?sessionId={self._session_id}&requestId={request_id}",
             json=message.model_dump(),
         )
         if response.status_code == 202:
@@ -238,7 +238,7 @@ async def _send_message_internal(
     async def _get_messages_internal(self, request_id: str) -> None:
         response = await self._uipath.api_client.request_async(
             "GET",
-            f"mcp_/mcp/{self._server_config.name}/in/messages?sessionId={self._session_id}&requestId={request_id}",
+            f"agenthub_/mcp/{self._server_config.name}/in/messages?sessionId={self._session_id}&requestId={request_id}",
         )
         if response.status_code == 200:
             self._last_request_id = request_id