diff --git a/net-mgmt/zabbix-agent/Makefile b/net-mgmt/zabbix-agent/Makefile
index b1160326c..189733fa3 100644
--- a/net-mgmt/zabbix-agent/Makefile
+++ b/net-mgmt/zabbix-agent/Makefile
@@ -1,7 +1,12 @@
 PLUGIN_NAME=		zabbix-agent
-PLUGIN_VERSION=		1.9
+PLUGIN_VERSION=		1.10
 PLUGIN_COMMENT=		Zabbix monitoring agent
-PLUGIN_DEPENDS=		zabbix5-agent
 PLUGIN_MAINTAINER=	opnsense@moov.de
+PLUGIN_VARIANTS=	zabbix5 zabbix54
 
+zabbix5_NAME=		zabbix-agent
+zabbix5_DEPENDS=		zabbix5-agent
+
+zabbix54_NAME=		zabbix54-agent
+zabbix54_DEPENDS=		zabbix54-agent
 .include "../../Mk/plugins.mk"
diff --git a/net-mgmt/zabbix-agent/pkg-descr b/net-mgmt/zabbix-agent/pkg-descr
index 8e22f3335..bb8f364c7 100644
--- a/net-mgmt/zabbix-agent/pkg-descr
+++ b/net-mgmt/zabbix-agent/pkg-descr
@@ -12,6 +12,11 @@ WWW: https://www.zabbix.com/
 Plugin Changelog
 ----------------
 
+1.10
+
+Changed:
+* Replace EnableRemoteCommands with AllowKey/DenyKey (#1978)
+
 1.9
 
 Added:
diff --git a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
index 3974f4408..bafea22b4 100644
--- a/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
+++ b/net-mgmt/zabbix-agent/src/opnsense/service/templates/OPNsense/ZabbixAgent/zabbix_agentd.conf
@@ -22,7 +22,11 @@ DebugLevel={{OPNsense.ZabbixAgent.settings.main.debugLevel|replace("val_", "")}}
 SourceIP={{OPNsense.ZabbixAgent.settings.main.sourceIP}}
 {% endif %}
 
-EnableRemoteCommands={{OPNsense.ZabbixAgent.settings.features.enableRemoteCommands}}
+{% if OPNsense.ZabbixAgent.settings.features.enableRemoteCommands|default("") == '1' %}
+AllowKey=system.run[*]
+{% else %}
+DenyKey=system.run[*]
+{% endif %}
 LogRemoteCommands={{OPNsense.ZabbixAgent.settings.features.logRemoteCommands}}
 
 Server={{OPNsense.ZabbixAgent.settings.main.serverList}}