diff --git a/security/clamav/Makefile b/security/clamav/Makefile
index 668ca3fd0..6daca4461 100644
--- a/security/clamav/Makefile
+++ b/security/clamav/Makefile
@@ -1,6 +1,6 @@
 PLUGIN_NAME=		clamav
 PLUGIN_VERSION=		1.7
-PLUGIN_REVISION=	1
+PLUGIN_REVISION=	2
 PLUGIN_COMMENT=		Antivirus engine for detecting malicious threats
 PLUGIN_DEPENDS=		clamav
 PLUGIN_MAINTAINER=	m.muenz@gmail.com
diff --git a/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/freshclam.sh b/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/freshclam.sh
index 5ce3c3d66..cc94eb91c 100755
--- a/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/freshclam.sh
+++ b/security/clamav/src/opnsense/scripts/OPNsense/ClamAV/freshclam.sh
@@ -37,7 +37,7 @@ elif pgrep -qF ${PIDFILE} 2> /dev/null; then
 elif [ -z "${COMMAND}" ]; then
 	echo "missing"
 else
-       daemon -f -p ${PIDFILE} freshclam --quiet
+       daemon -f -p ${PIDFILE} /usr/local/etc/rc.d/clamav-freshclam restart
        echo "starting"
 fi
 
diff --git a/security/clamav/src/opnsense/service/conf/actions.d/actions_clamav.conf b/security/clamav/src/opnsense/service/conf/actions.d/actions_clamav.conf
index f1d5d96a1..db9285bb3 100644
--- a/security/clamav/src/opnsense/service/conf/actions.d/actions_clamav.conf
+++ b/security/clamav/src/opnsense/service/conf/actions.d/actions_clamav.conf
@@ -1,6 +1,5 @@
 [start]
 command:
-    /usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh;
     /usr/local/etc/rc.d/clamav-freshclam start;
     /usr/local/etc/rc.d/clamav-clamd start
 parameters:
@@ -17,7 +16,6 @@ message:stopping ClamAV
 
 [restart]
 command:
-    /usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh;
     /usr/local/etc/rc.d/clamav-freshclam restart;
     /usr/local/etc/rc.d/clamav-clamd restart
 parameters:
@@ -31,9 +29,7 @@ type:script_output
 message:request ClamAV status
 
 [freshclam]
-command:
-    /usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh;
-    /usr/local/opnsense/scripts/OPNsense/ClamAV/freshclam.sh
+command:/usr/local/opnsense/scripts/OPNsense/ClamAV/freshclam.sh
 parameters:%s
 type:script_output
 message:Check or install signatures
diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd
index f46fa24a2..a36465aaa 100644
--- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd
+++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_clamd
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.clamav.general.enabled') and OPNsense.clamav.general.enabled == '1' %}
-clamav_clamd_var_script="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
+clamav_clamd_setup="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
 clamav_clamd_enable="YES"
 {% else %}
 clamav_clamd_enable="NO"
diff --git a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam
index 7315a1ae4..5a2fc06ca 100644
--- a/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam
+++ b/security/clamav/src/opnsense/service/templates/OPNsense/ClamAV/clamav_freshclam
@@ -1,5 +1,5 @@
 {% if helpers.exists('OPNsense.clamav.general.fc_enabled') and OPNsense.clamav.general.fc_enabled == '1' %}
-clamav_freshclam_var_script="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
+clamav_freshclam_setup="/usr/local/opnsense/scripts/OPNsense/ClamAV/setup.sh"
 clamav_freshclam_enable="YES"
 {% else %}
 clamav_freshclam_enable="NO"