diff --git a/modules/services/clamav.nix b/modules/services/clamav.nix
index ecb0a00..477be88 100644
--- a/modules/services/clamav.nix
+++ b/modules/services/clamav.nix
@@ -66,17 +66,15 @@ in
     };
 
     systemd.services.clamav-periodic-scan = mkIf (onAccessPaths != []) {
-      description = "ClamAV periodic scan of service data directories";
-      after = [ "clamav-daemon.service" ];
+      description = "Periodic ClamAV virus scan";
+      after = [ "clamav-daemon.service" "clamav-freshclam.service" ];
       requires = [ "clamav-daemon.service" ];
+      wants = [ "clamav-freshclam.service" ];
       onFailure = [ "clamav-virus-notify.service" ];
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = "${pkgs.clamav}/bin/clamdscan --verbose --multiscan --move=/quarantine ${lib.escapeShellArgs onAccessPaths}";
-        User = "clamav";
-        Group = "clamav";
-        SupplementaryGroups = [ "users" ];
-        TimeoutStartSec = "infinity";
+        ExecStart = "${pkgs.clamav}/bin/clamdscan --multiscan --fdpass --infected --allmatch --move=/quarantine ${lib.escapeShellArgs onAccessPaths}";
+        Slice = "system-clamav.slice";
       };
     };