diff --git a/servers/weaviate/server.yaml b/servers/weaviate/server.yaml
new file mode 100644
index 00000000..fc28fc38
--- /dev/null
+++ b/servers/weaviate/server.yaml
@@ -0,0 +1,32 @@
+name: weaviate
+image: mcp/mcp-server-weaviate
+type: server
+meta:
+    category: database
+    tags:
+        - database
+about:
+    title: Mcp server weaviate
+    description: Weaviate server, right now it only works with docker weaviate image. It requires weaviate to be running. To use it you need to set the WEAVIATE_HOST, WEAVIATE_PORT, WEAVIATE_SCHEME and WEAVIATE_AUTH_TOKEN environment variables. And it only uses queries. Insertion and deletion are not implemented yet.
+    icon: https://avatars.githubusercontent.com/u/37794290?v=4
+source:
+    project: https://github.com/FranciscoAz1/mcp-server-weaviate
+    branch: main
+config:
+    secrets:
+        - name: weaviate.auth-token
+          env: WEAVIATE_AUTH_TOKEN
+          example: your_auth_token
+    variables:
+        - name: weaviate.host
+          env: WEAVIATE_HOST
+          example: localhost
+        - name: weaviate.port
+          env: WEAVIATE_PORT
+          example: "8080"
+        - name: weaviate.scheme
+          env: WEAVIATE_SCHEME
+          example: https
+        - name: weaviate.log-level
+          env: WEAVIATE_LOG_LEVEL
+          example: info
\ No newline at end of file
diff --git a/servers/weaviate/tools.json b/servers/weaviate/tools.json
new file mode 100644
index 00000000..baed897b
--- /dev/null
+++ b/servers/weaviate/tools.json
@@ -0,0 +1,19 @@
+[
+  {
+    "name": "weaviate-insert-one",
+    "description": "Insert an object into Weaviate.",
+    "arguments": [
+      {"name": "collection", "type": "string", "description": "The collection name"},
+      {"name": "properties", "type": "object", "description": "Object properties to insert"}
+    ]
+  },
+  {
+    "name": "weaviate-query",
+    "description": "Query Weaviate with hybrid search.",
+    "arguments": [
+      {"name": "collection", "type": "string", "description": "The collection name"},
+      {"name": "query", "type": "string", "description": "The query string"},
+      {"name": "targetProperties", "type": "array", "items": {"type": "string"}, "description": "Properties to return"}
+    ]
+  }
+]
\ No newline at end of file