diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75285126..295ef9ca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@
 - Configuration loading consolidated across CLI, app, and client with consistent resolution order
 - `HaikuRAGApp`, MCP server, and A2A server now accept `config` parameter for programmatic configuration
 - Updated CLI documentation to clarify global vs per-command options
+- **BREAKING**: Standardized configuration filename to `haiku.rag.yaml` in user directories (was incorrectly using `config.yaml`). Users with existing `config.yaml` in their user directory will need to rename it to `haiku.rag.yaml`
 
 ## [0.14.1] - 2025-11-06
 
diff --git a/docs/configuration.md b/docs/configuration.md
index 8cb6c986..224f9e02 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -31,9 +31,9 @@ This creates a `haiku.rag.yaml` file in your current directory with all availabl
 1. Path specified via `--config` flag: `haiku-rag --config /path/to/config.yaml <command>`
 2. `./haiku.rag.yaml` (current directory)
 3. Platform-specific user directory:
-    - **Linux**: `~/.local/share/haiku.rag/config.yaml`
-    - **macOS**: `~/Library/Application Support/haiku.rag/config.yaml`
-    - **Windows**: `C:/Users/<USER>/AppData/Roaming/haiku.rag/config.yaml`
+    - **Linux**: `~/.local/share/haiku.rag/haiku.rag.yaml`
+    - **macOS**: `~/Library/Application Support/haiku.rag/haiku.rag.yaml`
+    - **Windows**: `C:/Users/<USER>/AppData/Roaming/haiku.rag/haiku.rag.yaml`
 
 ## Minimal Configuration
 
diff --git a/haiku_rag_slim/haiku/rag/config/loader.py b/haiku_rag_slim/haiku/rag/config/loader.py
index 0438e544..1317d41f 100644
--- a/haiku_rag_slim/haiku/rag/config/loader.py
+++ b/haiku_rag_slim/haiku/rag/config/loader.py
@@ -32,7 +32,8 @@ def find_config_file(cli_path: Path | None = None) -> Path | None:
     # Use same directory as data storage for config
     from haiku.rag.utils import get_default_data_dir
 
-    user_config = get_default_data_dir() / "config.yaml"
+    data_dir = get_default_data_dir()
+    user_config = data_dir / "haiku.rag.yaml"
     if user_config.exists():
         return user_config