diff --git a/host_vars/dell.yml b/host_vars/dell.yml
index fee4c1b..7d6323d 100644
--- a/host_vars/dell.yml
+++ b/host_vars/dell.yml
@@ -19,3 +19,6 @@ portainer_roles:
   - role: portainer_bookstack
   - role: portainer_vikunja
   - role: portainer_linkding
+#  - role: portainer_gotify
+#  - role: portainer_overseerr
+#  - role: portainer_pihole
diff --git a/host_vars/qnap.yml b/host_vars/qnap.yml
index 70071ea..9845692 100644
--- a/host_vars/qnap.yml
+++ b/host_vars/qnap.yml
@@ -69,10 +69,6 @@ services:
     template_vars:
       plex_image: lscr.io/linuxserver/plex
       plex_tag: 1.32.4
-  - name: uptime-kuma
-    template_vars:
-      image: louislam/uptime-kuma
-      tag: 1.22.0
   - name: mariadb
     template_vars:
       image: mariadb
@@ -100,3 +96,4 @@ portainer_roles:
   - role: portainer_gotify
   - role: portainer_pihole
   - role: portainer_overseerr
+  - role: portainer_uptime_kuma
diff --git a/roles/portainer_uptime_kuma/defaults/main.yml b/roles/portainer_uptime_kuma/defaults/main.yml
new file mode 100644
index 0000000..efbf7b1
--- /dev/null
+++ b/roles/portainer_uptime_kuma/defaults/main.yml
@@ -0,0 +1,7 @@
+---
+uptime_kuma_state: present
+uptime_kuma_image: louislam/uptime-kuma
+uptime_kuma_tag: 1.22.0
+uptime_kuma_expose_port: 3001
+uptime_kuma_container_name: uptime_kuma
+uptime_kuma_portainer_stack_name: uptime_kuma
diff --git a/roles/portainer_uptime_kuma/tasks/main.yml b/roles/portainer_uptime_kuma/tasks/main.yml
new file mode 100644
index 0000000..459ff5c
--- /dev/null
+++ b/roles/portainer_uptime_kuma/tasks/main.yml
@@ -0,0 +1,31 @@
+---
+- name: "Uptime Kuma | Restore any missing volumes from S3"
+  ansible.builtin.include_role:
+    name: chatton.docker_backup.docker_s3_volume_restore
+  vars:
+    docker_backup_s3_volume:
+      name: "{{ uptime_kuma_portainer_stack_name }}_data"
+
+- name: "Uptime Kuma | Update Portainer."
+  chatton.portainer.portainer_stack:
+    username: '{{ portainer_user }}'
+    password: '{{ portainer.password }}'
+    base_url: '{{ portainer_base_url }}'
+    stack_name: '{{ uptime_kuma_portainer_stack_name }}'
+    endpoint_id: '{{ portainer_endpoint }}'
+    state: "{{ uptime_kuma_state }}"
+    definition:
+      version: '3.3'
+      services:
+        uptime-kuma:
+          labels: "{{ backup_labels }}"
+          image: "{{ uptime_kuma_image }}:{{ uptime_kuma_tag }}"
+          container_name: "{{ uptime_kuma_container_name }}"
+          volumes:
+            - data:/app/data
+          ports:
+            - "{{ uptime_kuma_expose_port }}:3001"
+          restart: "{{ restart_policy }}"
+
+      volumes:
+        data: