diff --git a/roles/mgrote_docker_housekeeping/tasks/main.yml b/roles/mgrote_docker_housekeeping/tasks/main.yml
index 7037f603..b56c2559 100644
--- a/roles/mgrote_docker_housekeeping/tasks/main.yml
+++ b/roles/mgrote_docker_housekeeping/tasks/main.yml
@@ -24,10 +24,11 @@
 
 - name: Enable Units
   become: true
-  ansible.builtin.systemd:
+  ansible.builtin.systemd_service:
     name: "{{ item }}"
     enabled: true
     masked: false
+    daemon_reload: true
   with_items:
     - docker_housekeeping.service
     - docker_housekeeping.timer
diff --git a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2 b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2
index ae40c6d4..bf2424b4 100644
--- a/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2
+++ b/roles/mgrote_docker_housekeeping/templates/docker_housekeeping.service.j2
@@ -1,8 +1,8 @@
 {{ file_header | default () }}
 [Unit]
-Description=Docker housekeeping tasks
+Description=docker housekeeping tasks
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/docker system prune --force --filter "until=24h"
+ExecStart=/bin/bash -c '/usr/bin/docker system prune --force --filter "until=24h" --all && /usr/bin/docker buildx prune --force --filter "until=24h"'
 # https://docs.docker.com/config/pruning