diff --git a/Dockerfile b/Dockerfile
index bcf61946..a959523c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -97,7 +97,7 @@ RUN apt-get update -q --fix-missing && \
   rm -f /etc/cron.weekly/fstrim && \
   rm -f /etc/postsrsd.secret
 
-RUN echo "0 0,6,12,18 * * * root /usr/bin/freshclam --quiet" > /etc/cron.d/clamav-freshclam && \
+RUN echo "0 */6 * * * clamav /usr/bin/freshclam --quiet" > /etc/cron.d/clamav-freshclam && \
   chmod 644 /etc/clamav/freshclam.conf && \
   freshclam && \
   sed -i 's/Foreground false/Foreground true/g' /etc/clamav/clamd.conf && \
diff --git a/target/start-mailserver.sh b/target/start-mailserver.sh
index 1913b467..2ccc6566 100644
--- a/target/start-mailserver.sh
+++ b/target/start-mailserver.sh
@@ -1384,7 +1384,7 @@ function _fix_var_amavis_permissions() {
 function _fix_cleanup_clamav() {
     notify 'task' 'Cleaning up disabled Clamav'
     rm -f /etc/logrotate.d/clamav-*
-    rm -f /etc/cron.d/freshclam
+    rm -f /etc/cron.d/clamav-freshclam
 }
 
 ##########################################################################