diff --git a/auto/compose.comet.yaml b/auto/compose.comet.yaml
index 48b6e15..9393acf 100644
--- a/auto/compose.comet.yaml
+++ b/auto/compose.comet.yaml
@@ -1,34 +1,25 @@
 services:
   comet:
     container_name: comet
-    image: g0ldyy/comet:latest
+    image: g0ldyy/comet:rewrite
     restart: unless-stopped
     expose:
       - 2020
     environment:
-      - FASTAPI_PORT=2020
-      - FASTAPI_HOST=0.0.0.0
-      - FASTAPI_WORKERS=1
-      - ADDON_NAME=Comet
-      - ADDON_ID=stremio.comet.fast
       - DASHBOARD_ADMIN_PASSWORD=${COMET_ADMIN_PASSWORD}
-      - DATABASE_TYPE=postgresql
-      - DATABASE_URL=${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/comet
-      - CACHE_TTL=86400 # 1 day
       - DEBRID_PROXY_URL=http://warp:1080
       - INDEXER_MANAGER_TYPE=prowlarr # or jackett
       - INDEXER_MANAGER_URL=http://prowlarr:9696 # or http://jackett:9117
       - INDEXER_MANAGER_API_KEY=${PROWLARR_API_KEY:-} # or ${JACKETT_API_KEY:-}
-      - INDEXER_MANAGER_TIMEOUT=60 
-      - INDEXER_MANAGER_INDEXERS=${COMET_INDEXERS:-[]} # comma separated list of indexer ids
-      - GET_TORRENT_TIMEOUT=5
-      - ZILEAN_URL=http://zilean:8181
+      - INDEXER_MANAGER_INDEXERS=${COMET_INDEXERS:-[]} # comma separated list of indexer ids  # for jackett, get the names from https://github.com/Jackett/Jackett/tree/master/src/Jackett.Common/Definitions - for prowlarr you can write them like on the web dashboard
+      - SCRAPE_ZILEAN=True
+      - ZILEAN_URL=http://zilean:8181 # or https://zilean.elfhosted.com if not hosting zilean locally
       - ZILEAN_TAKE_FIRST=500
       - SCRAPE_TORRENTIO=False
       - SCRAPE_MEDIAFUSION=False
-      - MEDIAFUSION_URL=https://mediafusion.elfhosted.com
-      - PROXY_DEBRID_STREAM=False
-      - TITLE_MATCH_CHECK=True
+      - MEDIAFUSION_URL=http://mediafusion:8000 # or https://mediafusion.elfhosted.com if not hosting mediafusion locally
+      - STREMTHRU_URL=http://stremthru:8080 # or https://stremthru.13377001.xyz if not hosting stremthru locally
+      - DOWNLOAD_TORRENT_FILES=False
       - REMOVE_ADULT_CONTENT=True
     labels:
       - "traefik.enable=true"
@@ -38,9 +29,8 @@ services:
       - "flame.type=app"
       - "flame.name=Comet"
       - "flame.url=https://${COMET_HOSTNAME}"
-    depends_on:
-      postgres:
-        condition: service_healthy
+    volumes:
+      - ./data/comet:/data
     healthcheck: 
       test: wget -qO- http://127.0.0.1:2020/health
       interval: 1m
diff --git a/compose.yaml b/compose.yaml
index fe19ac6..154aaca 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -122,34 +122,24 @@ services:
 
   comet:
     container_name: comet
-    image: g0ldyy/comet:latest
+    image: g0ldyy/comet:rewrite
     restart: unless-stopped
     expose:
       - 2020
-    environment:
-      - FASTAPI_PORT=2020
-      - FASTAPI_HOST=0.0.0.0
-      - FASTAPI_WORKERS=1
-      - ADDON_NAME=Comet
-      - ADDON_ID=stremio.comet.fast
       - DASHBOARD_ADMIN_PASSWORD=${COMET_ADMIN_PASSWORD}
-      - DATABASE_TYPE=postgresql
-      - DATABASE_URL=${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/comet
-      - CACHE_TTL=86400 # 1 day
       - DEBRID_PROXY_URL=http://warp:1080
       - INDEXER_MANAGER_TYPE=prowlarr # or jackett
       - INDEXER_MANAGER_URL=http://prowlarr:9696 # or http://jackett:9117
       - INDEXER_MANAGER_API_KEY=${PROWLARR_API_KEY:-} # or ${JACKETT_API_KEY:-}
-      - INDEXER_MANAGER_TIMEOUT=60 
-      - INDEXER_MANAGER_INDEXERS=${COMET_INDEXERS:-[]} # comma separated list of indexer ids
-      - GET_TORRENT_TIMEOUT=5
-      - ZILEAN_URL=http://zilean:8181
+      - INDEXER_MANAGER_INDEXERS=${COMET_INDEXERS:-[]} # comma separated list of indexer ids  # for jackett, get the names from https://github.com/Jackett/Jackett/tree/master/src/Jackett.Common/Definitions - for prowlarr you can write them like on the web dashboard
+      - SCRAPE_ZILEAN=True
+      - ZILEAN_URL=http://zilean:8181 # or https://zilean.elfhosted.com if not hosting zilean locally
       - ZILEAN_TAKE_FIRST=500
       - SCRAPE_TORRENTIO=False
       - SCRAPE_MEDIAFUSION=False
-      - MEDIAFUSION_URL=https://mediafusion.elfhosted.com
-      - PROXY_DEBRID_STREAM=False
-      - TITLE_MATCH_CHECK=True
+      - MEDIAFUSION_URL=http://mediafusion:8000 # or https://mediafusion.elfhosted.com if not hosting mediafusion locally
+      - STREMTHRU_URL=http://stremthru:8080 # or https://stremthru.13377001.xyz if not hosting stremthru locally
+      - DOWNLOAD_TORRENT_FILES=False
       - REMOVE_ADULT_CONTENT=True
     labels:
       - "traefik.enable=true"
@@ -159,9 +149,8 @@ services:
       - "flame.type=app"
       - "flame.name=Comet"
       - "flame.url=https://${COMET_HOSTNAME}"
-    depends_on:
-      postgres:
-        condition: service_healthy
+    volumes:
+      - ./data/comet:/data
     healthcheck: 
       test: wget -qO- http://127.0.0.1:2020/health
       interval: 1m