diff --git a/compose.kuma.yaml b/compose.kuma.yaml
index 800542a..5d2b49c 100644
--- a/compose.kuma.yaml
+++ b/compose.kuma.yaml
@@ -4,17 +4,31 @@ services:
     container_name: uptime-kuma
     restart: unless-stopped
     volumes:
-      - /opt/uptime-kuma:/app/data
+      - /opt/kuma/uptime:/app/data
       - /var/run/docker.sock:/var/run/docker.sock
     ports:
       - "3001:3001"
+    healthcheck:
+          test: ["CMD-SHELL", "curl -f http://localhost:3001 || exit 1"]
+          interval: 60s
+          timeout: 10s
+          retries: 3
+          start_period: 30s
   auto-kuma:
-    image: ghcr.io/bigboot/autokuma:uptime-kuma-v1-sha-cbd2537
+    image: ghcr.io/bigboot/autokuma:2
     container_name: auto-kuma
-    environment:
-      - AUTOKUMA__KUMA__URL=http://host:3001
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
     restart: unless-stopped
-    extra_hosts:
-      - "host:${HOST_IP}"
+    environment:
+      AUTOKUMA__KUMA__URL: http://uptime-kuma:3001
+      AUTOKUMA__KUMA__USERNAME: user
+      AUTOKUMA__KUMA__PASSWORD: ycp3nadE7cPFLtnm
+      AUTOKUMA__DEFAULT_SETTINGS: |-
+          docker.docker_container: {{container_name}}
+          docker.docker_host: 1
+      RUST_LOG: debug
+    volumes:
+      - /opt/kuma/auto:/data
+      - /var/run/docker.sock:/var/run/docker.sock
+    depends_on:
+      uptime-kuma:
+        condition: service_healthy
diff --git a/compose.override.yaml b/compose.override.yaml
index 81abe6d..3739abc 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -20,10 +20,7 @@ services:
   surfshark:
     labels:
       - autoheal=true
-      - "kuma.monitor.name=Surfshark"
-      - "kuma.monitor.type=docker"
-      - "kuma.monitor.docker_host=1"
-      - "kuma.monitor.docker_container=surfshark"
+      - kuma.surfshark.name=Surfshark
   qbittorrent:
     labels:
       - autoheal=true
diff --git a/uptime-kuma/.gitignore b/uptime-kuma/.gitignore
deleted file mode 100644
index 72e8ffc..0000000
--- a/uptime-kuma/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*
diff --git a/uptime-kuma/db-config.json b/uptime-kuma/db-config.json
deleted file mode 100644
index 27252c9..0000000
--- a/uptime-kuma/db-config.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "type": "sqlite",
-    "port": 3306,
-    "hostname": "",
-    "username": "",
-    "password": "",
-    "dbName": "kuma"
-}
\ No newline at end of file