diff --git a/.gitignore b/.gitignore
index de36093c7f6..fd4f8aa8a97 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,6 +11,10 @@
 
 index_data
 
+# Default configuration for persist_directory in chromadb/config.py
+# Currently it's located in "./chroma/"
+chroma/
+
 venv
 .env
 .chroma
diff --git a/docker-compose.server.example.yml b/docker-compose.server.example.yml
index 5c575fe0ead..2c8228fad06 100644
--- a/docker-compose.server.example.yml
+++ b/docker-compose.server.example.yml
@@ -7,14 +7,16 @@ services:
   server:
     image: ghcr.io/chroma-core/chroma:latest
     volumes:
-      - index_data:/chroma/.chroma/index
+      # Default configuration for persist_directory in chromadb/config.py
+      # Currently it's located in "/chroma/chroma/"
+      - chroma_persistent_folder:/chroma/chroma/
     ports:
       - 8000:8000
     networks:
       - net
 
 volumes:
-  index_data:
-    driver: local
   backups:
     driver: local
+  chroma_persistent_folder:
+    driver: local
diff --git a/docker-compose.yml b/docker-compose.yml
index 1d78773052b..9316be5d554 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -12,7 +12,8 @@ services:
       dockerfile: Dockerfile
     volumes:
       - ./:/chroma
-      - index_data:/index_data
+      # Be aware that indexed data are located in "/chroma/chroma/"
+      # Default configuration for persist_directory in chromadb/config.py
     command: uvicorn chromadb.app:app --reload --workers 1 --host 0.0.0.0 --port 8000 --log-config log_config.yml
     environment:
       - IS_PERSISTENT=TRUE
@@ -26,7 +27,5 @@ services:
       - net
 
 volumes:
-  index_data:
-    driver: local
   backups:
-    driver: local
+    driver: local
\ No newline at end of file