diff --git a/.gitignore b/.gitignore
index 0ab57a3..91fcd16 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /original-files
-/takserver-release
\ No newline at end of file
+/takserver-release
+/data
\ No newline at end of file
diff --git a/docker-compose.yml b/docker-compose.yml
index 8bd51bc..b986496 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,14 +1,17 @@
-version: '3.8'
-
 networks:
   webserver:
     external: true
 
+    
+volumes:
+  takserver:
+  postgres-data:
+
 services:
   tak-hybrid:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    build: .
+    # image: git.merith.xyz/oci/takserver:nightly
+    restart: no
     ports:
       - "5432:5432"    # PostgreSQL
       - "8080:8080"    # TAK server web UI (typical port)
@@ -18,17 +21,9 @@ services:
       - webserver
     volumes:
       - ./takserver-release:/takserver-zip:ro
-      - takserver:/opt/tak
-      - postgres-data:/var/lib/postgresql/15/main
+      - ./data/takserver:/opt/tak
+      - ./data/postgres-data:/var/lib/postgresql/15/main
     environment:
-      POSTGRES_DB: cot
-      POSTGRES_USER: martiuser
-      POSTGRES_PASSWORD: password
-    restart: no
-    labels:
-      caddy: tak.merith.xyz
-      caddy.reverse_proxy: "{{upstreams 8080}}"
-
-volumes:
-  takserver:
-  postgres-data:
+      POSTGRES_DB: default_db
+      POSTGRES_USER: default_user
+      POSTGRES_PASSWORD: default_password
\ No newline at end of file