diff --git a/compose.kuma.yaml b/compose.kuma.yaml
deleted file mode 100644
index 5d2b49c..0000000
--- a/compose.kuma.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-services:
-  uptime-kuma:
-    image: louislam/uptime-kuma:2
-    container_name: uptime-kuma
-    restart: unless-stopped
-    volumes:
-      - /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:2
-    container_name: auto-kuma
-    restart: unless-stopped
-    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 3739abc..e1f0fdf 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -20,7 +20,6 @@ services:
   surfshark:
     labels:
       - autoheal=true
-      - kuma.surfshark.name=Surfshark
   qbittorrent:
     labels:
       - autoheal=true
diff --git a/compose.uptime.yaml b/compose.uptime.yaml
new file mode 100644
index 0000000..4cc3c3c
--- /dev/null
+++ b/compose.uptime.yaml
@@ -0,0 +1,17 @@
+services:
+  uptime:
+    image: louislam/uptime-kuma:2
+    container_name: uptime
+    restart: unless-stopped
+    volumes:
+      - /opt/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
+
diff --git a/compose.yaml b/compose.yaml
index 6dd8cad..5129176 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -7,7 +7,7 @@ include:
 
   # Other
   - compose.autoheal.yaml
-  - compose.kuma.yaml
+  - compose.uptime.yaml
   - compose.collectd.yaml
   - compose.telegraf.yaml
   - compose.homarr.yaml