diff --git a/servers/wannaflow-tools/server.yaml b/servers/wannaflow-tools/server.yaml
new file mode 100644
index 000000000..a05719a60
--- /dev/null
+++ b/servers/wannaflow-tools/server.yaml
@@ -0,0 +1,61 @@
+name: wannaflow-tools
+image: wannacrea/mcp-tools
+type: server
+meta:
+  category: development
+  tags:
+    - testing
+    - typescript
+    - validation
+    - memory
+    - cost-optimization
+    - development
+    - ai-tools
+    - token-savings
+about:
+  title: WannaFlow Tools
+  description: |
+    Standalone MCP tools for AI-assisted development workflows. Optimized for token efficiency with zero external dependencies.
+
+    **Tools included:**
+
+    • **auto_test** - Automated testing and validation for TypeScript/JavaScript
+      - Actions: run (jest/vitest/mocha), validate (type-check), full (lint + tests)
+      - Auto-detects test framework
+      - Returns structured results with file:line references
+
+    • **project_memory** - Persistent context storage between sessions
+      - Categories: decision, pattern, issue, context, preference
+      - SQLite-based persistence (no external DB required)
+      - Token savings: 30-50% by avoiding repetitive explanations
+
+    • **cost_analyzer** - Token cost prediction and optimization
+      - Actions: predict, compare, budget_check, optimize
+      - Supports 19+ models (local, deepseek, gemini, claude, gpt-4)
+      - All calculations local - no API required
+
+    Perfect for developers who want to optimize their AI-assisted workflow costs and maintain context between sessions.
+  icon: https://avatars.githubusercontent.com/u/wannacrea
+source:
+  project: https://github.com/wannacrea/mcp-tools
+run:
+  volumes:
+    - "{{wannaflow-tools.workspace_path}}:/workspace"
+    - "wannaflow-mcp-data:/data"
+config:
+  description: Configure workspace path and persistent storage for WannaFlow MCP Tools
+  env:
+    - name: WORKSPACE_PATH
+      example: /workspace
+      value: "/workspace"
+    - name: MCP_DATA_DIR
+      example: /data
+      value: "/data"
+  parameters:
+    type: object
+    properties:
+      workspace_path:
+        type: string
+        description: Path to your project workspace to analyze and test
+        default: /workspace
+    required: []