diff --git a/config/ansible/tasks/servers/services/beszel/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/beszel/docker-compose.yml.j2
index 12bbd2d..2b23067 100644
--- a/config/ansible/tasks/servers/services/beszel/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/beszel/docker-compose.yml.j2
@@ -6,11 +6,23 @@ services:
     ports:
       - '8090:8090'
     volumes:
-      - {{beszel_data_dir}}:/beszel_data
+      - {{beszel_data_dir}}/data:/beszel_data
+      - {{beszel_data_dir}}/socket:/beszel_socket
     networks:
       - beszel-net
       - caddy_network
 
+  beszel-agent:
+    image: henrygd/beszel-agent:latest
+    restart: unless-stopped
+    network_mode: host
+    volumes:
+      - {{beszel_data_dir}}/socket:/beszel_socket
+      - /var/run/docker.sock:/var/run/docker.sock:ro
+    environment:
+      LISTEN: /beszel_socket/beszel.sock
+      KEY: 'ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHvh4PlT2gVh1dEOXn5C9NIjmhgEH/iSSMZpDj6SKTld'
+
 networks:
   beszel-net:
   caddy_network:
diff --git a/config/ansible/tasks/servers/services/uptime-kuma/docker-compose.yml.j2 b/config/ansible/tasks/servers/services/uptime-kuma/docker-compose.yml.j2
index 2ce25dd..3b3dca6 100644
--- a/config/ansible/tasks/servers/services/uptime-kuma/docker-compose.yml.j2
+++ b/config/ansible/tasks/servers/services/uptime-kuma/docker-compose.yml.j2
@@ -1,7 +1,7 @@
+name: monitoring
 services:
   uptime-kuma:
     image: louislam/uptime-kuma:latest
-    container_name: uptime-kuma
     restart: unless-stopped
     volumes:
       - {{ uptime_kuma_data_dir }}:/app/data