diff --git a/env.yml b/env.yml
index 8eeb563..6dbd3b9 100644
--- a/env.yml
+++ b/env.yml
@@ -64,7 +64,6 @@ projects:
 
 projects_to_backup:
   - keycloak
-  - uptime-kuma
 
 
 borg_repodir: "{{ cifs_mounts['backups']['path'] }}/borg"
diff --git a/projects/uptime/compose.yaml.mako b/projects/uptime/compose.yaml.mako
new file mode 100644
index 0000000..25be459
--- /dev/null
+++ b/projects/uptime/compose.yaml.mako
@@ -0,0 +1,13 @@
+services:  
+  uptime:
+    container_name: uptime
+    image: docker.io/louislam/uptime-kuma:1
+    network_mode: pasta:-a,${env['pasta']['uptime']['ipv4']},-a,${env['pasta']['uptime']['ipv6']}
+    restart: always
+    environment:
+      - PUID=${env['users']['uptime']}
+      - PGID=${env['users']['uptime']}
+    ports:
+      - 127.0.0.1:${env['ports']['uptime']}:3001
+    volumes:
+      - ${env['volumes']['uptime']['datadir']}:/app/data
diff --git a/pyenv.yml b/pyenv.yml
index 53173a6..250ab84 100644
--- a/pyenv.yml
+++ b/pyenv.yml
@@ -34,6 +34,7 @@ backup:
 
 backup_sqlite:
   stump: /mnt/stump/config/stump.db
+  uptime: /mnt/uptimekumadata/kuma.db
 
 borg_repo: /mnt/storagebox/backups/borg2
 borg_prune_opts:
@@ -81,6 +82,9 @@ pasta:
   syncthing_relaysrv:
     ipv4: 10.86.21.1
     ipv6: fc86::21
+  uptime:
+    ipv4: 10.86.22.1
+    ipv6: fc86::22
   vaultwarden:
     ipv4: 10.86.23.1
     ipv6: fc86::23
@@ -110,7 +114,7 @@ ports:
   syncthing_webui: 8384
   syncthing_tcp: 9100
   syncthing_udp: 22000
-  uptime_kuma: 3001
+  uptime: 3001
   vaultwarden: 8081
 
 
@@ -132,7 +136,7 @@ users:
   syncthing: 1001
   syncthing_discosrv: 1002
   syncthing_relaysrv: 1003
-  uptime_kuma: 1006
+  uptime: 1006
   vaultwarden: 1010
 
 
@@ -156,7 +160,7 @@ volumes:
     datadir: /mnt/synapsedata
   syncthing:
     datadir: /mnt/storagebox/syncthing
-  uptimekuma:
+  uptime:
     datadir: /mnt/uptimekumadata
   vaultwarden:
     datadir: /mnt/vwdata