diff --git a/public/svgs/weaviate.png b/public/svgs/weaviate.png
new file mode 100644
index 000000000..134294253
Binary files /dev/null and b/public/svgs/weaviate.png differ
diff --git a/templates/compose/weaviate.yaml b/templates/compose/weaviate.yaml
new file mode 100644
index 000000000..54c767ff7
--- /dev/null
+++ b/templates/compose/weaviate.yaml
@@ -0,0 +1,50 @@
+# documentation: https://weaviate.io/developers/weaviate
+# slogan: Weaviate is an open-source vector database that stores both objects and vectors, allowing for combining vector search with structured filtering.
+# tags: ai, vector-database, semantic-search, machine-learning, bm25, embeddings, llm
+# logo: svgs/weaviate.png
+# port: 8080
+
+version: "3"
+
+services:
+  weaviate:
+    image: "cr.weaviate.io/semitechnologies/weaviate:1.26.4"
+    restart: always
+    volumes:
+      - "weaviate_data:/var/lib/weaviate"
+    command:
+      - "--host"
+      - 0.0.0.0
+      - "--port"
+      - "8080"
+      - "--scheme"
+      - http
+    environment:
+      - SERVICE_FQDN_WEAVIATE_8080
+      - DISABLE_TELEMETRY=true
+      - QUERY_DEFAULTS_LIMIT=1000
+      - LOG_LEVEL=info
+      - GOMEMLIMIT=${GOMEMLIMIT:-1024MiB}
+      - GOMAXPROCS=${GOMAXPROCS:-2}
+      - AUTHENTICATION_ANONYMOUS_ACCESS_ENABLED=false
+      - AUTHORIZATION_ADMINLIST_USERS=${AUTHORIZATION_ADMINLIST_USERS:-admin@example.com}
+      - AUTHENTICATION_APIKEY_USERS=${AUTHENTICATION_APIKEY_USERS:-admin@example.com}
+      - AUTHENTICATION_APIKEY_ENABLED=true
+      - "AUTHENTICATION_APIKEY_ALLOWED_KEYS=${SERVICE_PASSWORD_APIKEYS}"
+      - PERSISTENCE_DATA_PATH=/var/lib/weaviate
+      - DEFAULT_VECTORIZER_MODULE=none
+      - ENABLE_MODULES=${ENABLE_MODULES:-text2vec-openai,generative-openai,qna-openai}
+      - CLUSTER_HOSTNAME=node1
+    healthcheck:
+      test:
+        - CMD
+        - wget
+        - "-q"
+        - "--spider"
+        - "http://localhost:8080/v1/.well-known/ready"
+      interval: 5s
+      timeout: 5s
+      retries: 3
+
+volumes:
+  weaviate_data: null