diff --git a/emulators/qemu-guest-agent/Makefile b/emulators/qemu-guest-agent/Makefile
index ff879738b..e6b0f8d8c 100644
--- a/emulators/qemu-guest-agent/Makefile
+++ b/emulators/qemu-guest-agent/Makefile
@@ -1,5 +1,6 @@
 PLUGIN_NAME=		qemu-guest-agent
 PLUGIN_VERSION=		1.1
+PLUGIN_REVISION=	1
 PLUGIN_COMMENT=		QEMU Guest Agent for OPNsense
 PLUGIN_DEPENDS=		qemu-guest-agent
 PLUGIN_MAINTAINER=	opnsense@moov.de
diff --git a/emulators/qemu-guest-agent/src/opnsense/service/conf/actions.d/actions_qemuguestagent.conf b/emulators/qemu-guest-agent/src/opnsense/service/conf/actions.d/actions_qemuguestagent.conf
index c236540b2..6a24b46a8 100644
--- a/emulators/qemu-guest-agent/src/opnsense/service/conf/actions.d/actions_qemuguestagent.conf
+++ b/emulators/qemu-guest-agent/src/opnsense/service/conf/actions.d/actions_qemuguestagent.conf
@@ -1,23 +1,17 @@
 [start]
-command:/usr/local/opnsense/scripts/OPNsense/QemuGuestAgent/setup.sh; /usr/local/etc/rc.d/qemu-guest-agent start
+command:/usr/local/etc/rc.d/qemu-guest-agent start
 parameters:
 type:script
 message:starting qemu-guest-agent
 
 [stop]
-command:/usr/local/etc/rc.d/qemu-guest-agent stop; exit 0
+command:/usr/local/etc/rc.d/qemu-guest-agent stop
 parameters:
 type:script
 message:stopping qemu-guest-agent
 
 [restart]
-command:/usr/local/opnsense/scripts/OPNsense/QemuGuestAgent/setup.sh; /usr/local/etc/rc.d/qemu-guest-agent restart
-parameters:
-type:script
-message:restarting qemu-guest-agent
-
-[reload]
-command:/usr/local/opnsense/scripts/OPNsense/QemuGuestAgent/setup.sh; /usr/local/etc/rc.d/qemu-guest-agent restart
+command:/usr/local/etc/rc.d/qemu-guest-agent restart
 parameters:
 type:script
 message:restarting qemu-guest-agent
diff --git a/emulators/qemu-guest-agent/src/opnsense/service/templates/OPNsense/QemuGuestAgent/rc.conf.d b/emulators/qemu-guest-agent/src/opnsense/service/templates/OPNsense/QemuGuestAgent/rc.conf.d
index ea9c80f8c..301b81ccb 100644
--- a/emulators/qemu-guest-agent/src/opnsense/service/templates/OPNsense/QemuGuestAgent/rc.conf.d
+++ b/emulators/qemu-guest-agent/src/opnsense/service/templates/OPNsense/QemuGuestAgent/rc.conf.d
@@ -8,6 +8,7 @@
 {%   if helpers.exists('OPNsense.QemuGuestAgent.general.DisabledRPCs') and not helpers.empty('OPNsense.QemuGuestAgent.general.DisabledRPCs') %}
 {%     do optional_flags.append('--blacklist=' ~ OPNsense.QemuGuestAgent.general.DisabledRPCs) %}
 {%   endif %}
+qemu_guest_agent_setup="/usr/local/opnsense/scripts/OPNsense/QemuGuestAgent/setup.sh"
 qemu_guest_agent_enable="YES"
 qemu_guest_agent_flags="{{optional_flags|join(' ')}}"
 {% else %}