diff --git a/CHANGELOG.md b/CHANGELOG.md
index 31ab51b..32f7c8e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.10.9] - 2026-01-08
+
+### Fixed
+
+- **Environment user ID cleanup** - Strip email domain from user identifier
+  - If `preferred_username` is an email, extract just the username part
+  - Ensures Qdrant collection name matches (e.g., `volatile_jpmschweitzer` not `volatile_jpmschweitzer@gmail.com`)
+
 ## [1.10.8] - 2026-01-08
 
 ### Fixed
diff --git a/pyproject.toml b/pyproject.toml
index 15fb408..68392e2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "core-api"
-version = "1.10.8"
+version = "1.10.9"
 description = "Core Code API - Infrastructure management and tools API"
 readme = "README.md"
 requires-python = ">=3.12"
diff --git a/src/domains/tools/controller.py b/src/domains/tools/controller.py
index b0d00e3..5821e5f 100644
--- a/src/domains/tools/controller.py
+++ b/src/domains/tools/controller.py
@@ -198,6 +198,9 @@ class ToolsController(BaseController):
                 user_id = "default"
                 if user:
                     user_id = user.get("preferred_username") or user.get("sub", "default")
+                    # Strip email domain if present (e.g., "user@example.com" -> "user")
+                    if "@" in user_id:
+                        user_id = user_id.split("@")[0]
 
                 logger.info(f"Fetching environment data for user: {user_id}")
                 result = await self.environment_service.get_current(user_id)