diff --git a/caddy/Caddyfile b/caddy/Caddyfile
index af87238..8ece17c 100644
--- a/caddy/Caddyfile
+++ b/caddy/Caddyfile
@@ -51,6 +51,7 @@ import protected jupyter host:9999
 import protected nodered host:1880
 import protected teslamate host:4000
 import protected beszel host:8090
+import protected uptime host:3001
 
 import sites/root.caddy
 import sites/authentik.caddy
diff --git a/compose.kuma.yaml b/compose.kuma.yaml
new file mode 100644
index 0000000..c797e5b
--- /dev/null
+++ b/compose.kuma.yaml
@@ -0,0 +1,20 @@
+services:
+  uptime-kuma:
+    image: louislam/uptime-kuma:2
+    container_name: uptime-kuma
+    restart: unless-stopped
+    volumes:
+     - /opt/uptime-kuma:/app/data
+     - /var/run/docker.sock:/var/run/docker.sock
+    ports:
+     - "3001:3001"
+  auto-kuma:
+    image: ghcr.io/bigboot/autokuma:uptime-kuma-v1-sha-cbd2537 
+    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}"
diff --git a/compose.override.yaml b/compose.override.yaml
index a24a30b..81abe6d 100644
--- a/compose.override.yaml
+++ b/compose.override.yaml
@@ -1,8 +1,30 @@
 services:
-  sonarr:
+  seafile-mysql:
+    labels:
+      - autoheal=true
+  seadoc-server:
+    labels:
+      - autoheal=true
+  timescaledb:
+    labels:
+      - autoheal=true
+  beszel:
+    labels:
+      - autoheal=true
+  dsmrdb:
+    labels:
+      - autoheal=true
+  nodered:
     labels:
       - autoheal=true
   surfshark:
+    labels:
+      - autoheal=true
+      - "kuma.monitor.name=Surfshark"
+      - "kuma.monitor.type=docker"
+      - "kuma.monitor.docker_host=1"
+      - "kuma.monitor.docker_container=surfshark"
+  qbittorrent:
     labels:
       - autoheal=true
   teslamate-grafana:
@@ -17,31 +39,19 @@ services:
   authentik-worker:
     labels:
       - autoheal=true
-  esphome:
+  pgadmin:
     labels:
       - autoheal=true
-  mediamtx:
+  photoprism:
     labels:
       - autoheal=true
-  tesla-scraper:
+  prowlarr:
     labels:
       - autoheal=true
-  radarr:
+  transmission:
     labels:
       - autoheal=true
-  telegraf:
-    labels:
-      - autoheal=true
-  teslamate:
-    labels:
-      - autoheal=true
-  timescaledb:
-    labels:
-      - autoheal=true
-  jellyfin:
-    labels:
-      - autoheal=true
-  dsmrdb:
+  borgmatic:
     labels:
       - autoheal=true
   influxdb:
@@ -50,73 +60,10 @@ services:
   dsmr:
     labels:
       - autoheal=true
-  caddy:
-    labels:
-      - autoheal=true
-  postgis:
-    labels:
-      - autoheal=true
-  prowlarr:
-    labels:
-      - autoheal=true
-  qbittorrent:
-    labels:
-      - autoheal=true
-  seafile-mysql:
-    labels:
-      - autoheal=true
-  seadoc-server:
-    labels:
-      - autoheal=true
-  droppy:
-    labels:
-      - autoheal=true
-  gitea:
-    labels:
-      - autoheal=true
-  readarr:
-    labels:
-      - autoheal=true
-  rsnapshot:
-    labels:
-      - autoheal=true
-  transmission:
-    labels:
-      - autoheal=true
-  autoheal:
-    labels:
-      - autoheal=true
-  borgmatic:
-    labels:
-      - autoheal=true
-  collectd:
-    labels:
-      - autoheal=true
   filebrowser:
     labels:
       - autoheal=true
-  fluentbit:
-    labels:
-      - autoheal=true
-  goodwe:
-    labels:
-      - autoheal=true
-  homarr:
-    labels:
-      - autoheal=true
-  bazarr:
-    labels:
-      - autoheal=true
-  beszel:
-    labels:
-      - autoheal=true
-  jackett:
-    labels:
-      - autoheal=true
-  jellyseerr:
-    labels:
-      - autoheal=true
-  minio:
+  gitea:
     labels:
       - autoheal=true
   seafile-redis:
@@ -125,7 +72,55 @@ services:
   seafile-server:
     labels:
       - autoheal=true
-  loki:
+  sonarr:
+    labels:
+      - autoheal=true
+  telegraf:
+    labels:
+      - autoheal=true
+  uptime-kuma:
+    labels:
+      - autoheal=true
+  dns-ad-blocker:
+    labels:
+      - autoheal=true
+  esphome:
+    labels:
+      - autoheal=true
+  postgis:
+    labels:
+      - autoheal=true
+  rsnapshot:
+    labels:
+      - autoheal=true
+  tesla-scraper:
+    labels:
+      - autoheal=true
+  teslamate:
+    labels:
+      - autoheal=true
+  goodwe:
+    labels:
+      - autoheal=true
+  grafana:
+    labels:
+      - autoheal=true
+  homarr:
+    labels:
+      - autoheal=true
+  homeassistant:
+    labels:
+      - autoheal=true
+  minio:
+    labels:
+      - autoheal=true
+  postgres:
+    labels:
+      - autoheal=true
+  readarr:
+    labels:
+      - autoheal=true
+  droppy:
     labels:
       - autoheal=true
   authentik-server:
@@ -134,27 +129,39 @@ services:
   beszel-agent:
     labels:
       - autoheal=true
-  grafana:
+  collectd:
     labels:
       - autoheal=true
-  homeassistant:
+  jellyseerr:
+    labels:
+      - autoheal=true
+  mediamtx:
     labels:
       - autoheal=true
   mosquitto:
     labels:
       - autoheal=true
-  photoprism:
+  radarr:
     labels:
       - autoheal=true
-  dns-ad-blocker:
+  caddy:
     labels:
       - autoheal=true
-  nodered:
+  loki:
     labels:
       - autoheal=true
-  pgadmin:
+  autoheal:
     labels:
       - autoheal=true
-  postgres:
+  bazarr:
+    labels:
+      - autoheal=true
+  fluentbit:
+    labels:
+      - autoheal=true
+  jackett:
+    labels:
+      - autoheal=true
+  jellyfin:
     labels:
       - autoheal=true
diff --git a/compose.yaml b/compose.yaml
index a1caf75..6dd8cad 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -7,6 +7,7 @@ include:
 
   # Other
   - compose.autoheal.yaml
+  - compose.kuma.yaml
   - compose.collectd.yaml
   - compose.telegraf.yaml
   - compose.homarr.yaml
diff --git a/uptime-kuma/.gitignore b/uptime-kuma/.gitignore
new file mode 100644
index 0000000..72e8ffc
--- /dev/null
+++ b/uptime-kuma/.gitignore
@@ -0,0 +1 @@
+*
diff --git a/uptime-kuma/db-config.json b/uptime-kuma/db-config.json
new file mode 100644
index 0000000..27252c9
--- /dev/null
+++ b/uptime-kuma/db-config.json
@@ -0,0 +1,8 @@
+{
+    "type": "sqlite",
+    "port": 3306,
+    "hostname": "",
+    "username": "",
+    "password": "",
+    "dbName": "kuma"
+}
\ No newline at end of file