diff --git a/docker-compose.yaml b/docker-compose.yaml
index 42ac3d6..a9486bb 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -99,14 +99,19 @@ services:
     networks:
       - shared_net
 
-  chromaviz:
-    image: mtybadger/chromaviz:latest
+
+chromadb:
+    container_name: chromadb
+    image: ${CHROMADB:-chromadb/chroma:latest}
+    restart: always
     ports:
-      - "5000:5000"
+      - 8000:8000
+    volumes:
+      - chromadb:/chroma  # Persist database storage
     environment:
-      CHROMA_API_URL: http://chromadb:8000
-    depends_on:
-      - chromadb
+      IS_PERSISTENT: TRUE  # Enable persistent storage
+    networks:
+      - shared_net
 
 volumes:
   ollama: