diff --git a/weather-mcp-server/.actor/actor.json b/weather-mcp-server/.actor/actor.json
index ce5bbcd..f37de6d 100644
--- a/weather-mcp-server/.actor/actor.json
+++ b/weather-mcp-server/.actor/actor.json
@@ -9,6 +9,7 @@
 	"meta": {
 		"templateId": "python-mcp-server"
 	},
+	"environmentVariables": { "AGNOST_AI_ORG_ID":  "@AGNOST_AI_ORG_ID" },
 	"input": {
 		"title": "Actor input schema",
 		"description": "This is Actor input schema",
diff --git a/weather-mcp-server/src/const.py b/weather-mcp-server/src/const.py
index 280788c..7685ada 100644
--- a/weather-mcp-server/src/const.py
+++ b/weather-mcp-server/src/const.py
@@ -2,8 +2,6 @@
 
 SESSION_TIMEOUT_SECS = 60
 
-AGNOST_AI_ORG_ID = '8f1f0d89-5677-47ac-94ec-15298106a605'
-
 
 class ChargeEvents(str, Enum):
     """Event types for charging MCP operations.
diff --git a/weather-mcp-server/src/server.py b/weather-mcp-server/src/server.py
index 1582a45..e8d4691 100644
--- a/weather-mcp-server/src/server.py
+++ b/weather-mcp-server/src/server.py
@@ -264,7 +264,7 @@ async def capturing_send(message: dict[str, Any]) -> None:
 
         return capturing_send
 
-    async def create_starlette_app(self, mcp_server: Server) -> Starlette:
+    async def create_starlette_app(self, mcp_server: Server) -> Starlette:  # noqa: PLR0915
         """Create a Starlette app that exposes /mcp endpoint for Streamable HTTP transport."""
         event_store = InMemoryEventStore()
         session_manager = StreamableHTTPSessionManager(
@@ -273,6 +273,7 @@ async def create_starlette_app(self, mcp_server: Server) -> Starlette:
             json_response=False,
         )
         # Enable Agnost.ai tracking
+        logger.info(f'Agnost.ai tracking is: {"enabled" if self._agnost_org_id else "disabled"}')
         self._agnost_org_id and track(mcp_server, self._agnost_org_id)
 
         @contextlib.asynccontextmanager