diff --git a/services/mcp-bybit/src/mcp_bybit/__main__.py b/services/mcp-bybit/src/mcp_bybit/__main__.py
index a997fa9..b821c4f 100644
--- a/services/mcp-bybit/src/mcp_bybit/__main__.py
+++ b/services/mcp-bybit/src/mcp_bybit/__main__.py
@@ -5,6 +5,7 @@ import os
 
 import uvicorn
 from mcp_common.auth import load_token_store_from_files
+from mcp_common.environment import resolve_environment
 from mcp_common.logging import configure_root_logging
 
 from mcp_bybit.client import BybitClient
@@ -19,20 +20,32 @@ def main():
     with open(creds_file) as f:
         creds = json.load(f)
 
-    testnet_env = os.environ.get("BYBIT_TESTNET", "true").lower()
-    testnet = testnet_env not in ("0", "false", "no")
+    creds.setdefault("base_url_live", "https://api.bybit.com")
+    creds.setdefault("base_url_testnet", "https://api-testnet.bybit.com")
+
+    env_info = resolve_environment(
+        creds,
+        env_var="BYBIT_TESTNET",
+        flag_key="testnet",
+        exchange="bybit",
+    )
 
     client = BybitClient(
         api_key=creds["api_key"],
         api_secret=creds["api_secret"],
-        testnet=testnet,
+        testnet=(env_info.environment == "testnet"),
     )
 
     token_store = load_token_store_from_files(
         core_token_file=os.environ.get("CORE_TOKEN_FILE"),
         observer_token_file=os.environ.get("OBSERVER_TOKEN_FILE"),
     )
-    app = create_app(client=client, token_store=token_store)
+    app = create_app(
+        client=client,
+        token_store=token_store,
+        creds=creds,
+        env_info=env_info,
+    )
     uvicorn.run(
         app,
         log_config=None,