diff --git a/src/main/resources/mcp-servers.json b/src/main/resources/mcp-servers.json
index ac8c342..aa53c72 100644
--- a/src/main/resources/mcp-servers.json
+++ b/src/main/resources/mcp-servers.json
@@ -1,108 +1,29 @@
 {
   "servers": [
-    {
-      "id": "filesystem",
-      "name": "Filesystem MCP Server",
-      "description": "Exposes file browsing and file manipulation tools for a configured root path.",
-      "transport": "stdio",
-      "command": "npx",
-      "args": [
-        "-y",
-        "@modelcontextprotocol/server-filesystem"
-      ],
-      "configurationSchema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "rootPath": {
-            "type": "string",
-            "description": "Absolute or workspace-relative root path exposed by the server."
-          },
-          "readOnly": {
-            "type": "boolean",
-            "description": "If true, disable write operations.",
-            "default": true
-          }
-        },
-        "required": [
-          "rootPath"
-        ]
-      }
-    },
     {
       "id": "postgres",
-      "name": "PostgreSQL MCP Server",
+      "name": "Internal PostgreSQL MCP Server",
       "description": "Provides tools to inspect schemas and execute SQL queries against a PostgreSQL database.",
       "transport": "stdio",
-      "command": "npx",
+      "command": "docker",
       "args": [
-        "-y",
-        "@modelcontextprotocol/server-postgres"
+        "run",
+        "-i",
+        "--rm",
+        "--network",
+        "mcp-net",
+        "-e",
+        "DATABASE_URI",
+        "crystaldba/postgres-mcp:0.3.0",
+        "--access-mode=unrestricted"
       ],
+      "env": {
+        "DATABASE_URI": "postgresql://mcpuser:cambia_questa_password@postgres-mcp-db:5432/appdb"
+      },
       "configurationSchema": {
         "type": "object",
         "additionalProperties": false,
-        "properties": {
-          "host": {
-            "type": "string",
-            "description": "Database host name."
-          },
-          "port": {
-            "type": "integer",
-            "description": "Database port.",
-            "default": 5432
-          },
-          "database": {
-            "type": "string",
-            "description": "Database name."
-          },
-          "username": {
-            "type": "string",
-            "description": "Database username."
-          },
-          "password": {
-            "type": "string",
-            "description": "Database password or secret reference."
-          },
-          "ssl": {
-            "type": "boolean",
-            "description": "Enable SSL for the database connection.",
-            "default": false
-          }
-        },
-        "required": [
-          "host",
-          "database",
-          "username"
-        ]
-      }
-    },
-    {
-      "id": "http-json",
-      "name": "HTTP JSON MCP Server",
-      "description": "Generic MCP adapter for external HTTP APIs returning JSON payloads.",
-      "transport": "http",
-      "configurationSchema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "baseUrl": {
-            "type": "string",
-            "description": "Base URL of the upstream HTTP API."
-          },
-          "apiKey": {
-            "type": "string",
-            "description": "Optional API key used by the upstream service."
-          },
-          "timeoutSeconds": {
-            "type": "integer",
-            "description": "Client timeout in seconds.",
-            "default": 30
-          }
-        },
-        "required": [
-          "baseUrl"
-        ]
+        "properties": { }
       }
     },
     {
@@ -120,6 +41,47 @@
         "additionalProperties": false,
         "properties": { }
       }
+    },
+    {
+      "id": "rag",
+      "name": "Internal RAG MCP Server",
+      "description": "Runs the custom RAG MCP server inside the rag-mcp-server container.",
+      "transport": "stdio",
+      "command": "docker",
+      "args": [
+        "run",
+        "-i",
+        "--rm",
+        "--network",
+        "mcp-net",
+        "-e",
+        "PYTHONPATH=/app",
+        "-v",
+        "/home/cirillo/workspace/rag-data:/app/data",
+        "rag-mcp-server:latest",
+        "python",
+        "/app/src/rag_server.py"
+      ],
+      "configurationSchema": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": { }
+      }
+    },
+    {
+      "id": "url-downloader",
+      "name": "URL Downloader MCP Server",
+      "description": "Provides MCP tools to download content from URLs.",
+      "transport": "stdio",
+      "command": "uvx",
+      "args": [
+        "mcp-url-downloader"
+      ],
+      "configurationSchema": {
+        "type": "object",
+        "additionalProperties": false,
+        "properties": { }
+      }
     }
   ]
 }