diff --git a/tasks/install_validation_tools.yml b/tasks/install_validation_tools.yml
index 274602583d309da5b9863b17a20d301a2d7e3a6f..ef38fc201403e6d998e43bcc7c424a97cfa23f6b 100644
--- a/tasks/install_validation_tools.yml
+++ b/tasks/install_validation_tools.yml
@@ -147,29 +147,29 @@
   changed_when: false
 
 - name: enable & start cleanup daemon
-  ansible.builtin.systemd:
-    unit: "cleanup_daemon_@{{ item.u }}"
+  ansible.builtin.systemd_service:
+    unit: "cleanup_daemon{{ item.u }}"
     daemon_reload: true
-    enabled: true
+    enabled: "{{ item.e | default(true) }}"
     state: "{{ item.s | default(omit) }}"    # this can never be idempotent
   loop:
     # Timers...
-    - u: "ddz.timer"
+    - u: "_@ddz.timer"
       s: "restarted"
-    - u: "digas.timer"
+    - u: "_@digas.timer"
       s: "restarted"
-    - u: "fotothek.timer"
+    - u: "_@fotothek.timer"
       s: "restarted"
-    - u: "mediathek.timer"
+    - u: "_@mediathek.timer"
       s: "restarted"
-    - u: "save.timer"
+    - u: "_@save.timer"
       s: "restarted"
     # ... and their respective services
-    - u: "ddz.service"
-    - u: "digas.service"
-    - u: "fotothek.service"
-    - u: "mediathek.service"
-    - u: "save.service"
+    - u: "_@ddz.service"
+    - u: "_@digas.service"
+    - u: "_@fotothek.service"
+    - u: "_@mediathek.service"
+    - u: "_@save.service"
   changed_when: false
 
 - name: enable & start validation Webservice