diff --git a/Mk/defaults.mk b/Mk/defaults.mk
index 518004e55..aa06adb61 100644
--- a/Mk/defaults.mk
+++ b/Mk/defaults.mk
@@ -77,6 +77,7 @@ REPLACEMENTS=	PLUGIN_ABI \
 		PLUGIN_NAME \
 		PLUGIN_PKGNAME \
 		PLUGIN_PKGVERSION \
+		PLUGIN_VARIANT \
 		PLUGIN_WWW
 
 SED_REPLACE=	# empty
diff --git a/net-mgmt/zabbix-proxy/pkg-descr b/net-mgmt/zabbix-proxy/pkg-descr
index 158cf6087..fdffbe0b9 100644
--- a/net-mgmt/zabbix-proxy/pkg-descr
+++ b/net-mgmt/zabbix-proxy/pkg-descr
@@ -24,7 +24,7 @@ Plugin Changelog
 
 1.3
 
-* Switch to zabbix5-proxy
+* Added support for Zabbix 5
 
 1.2
 
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS
deleted file mode 100644
index b797902b6..000000000
--- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS
+++ /dev/null
@@ -1,3 +0,0 @@
-zabbix_proxy:/etc/rc.conf.d/zabbix_proxy
-zabbix_proxy.conf:/usr/local/etc/zabbix5/zabbix_proxy.conf
-zabbix_proxy.psk:/usr/local/etc/zabbix5/zabbix_proxy.psk
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS.in b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS.in
new file mode 100644
index 000000000..2176faf2b
--- /dev/null
+++ b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/+TARGETS.in
@@ -0,0 +1,3 @@
+zabbix_proxy:/etc/rc.conf.d/zabbix_proxy
+zabbix_proxy.conf:/usr/local/etc/%%PLUGIN_VARIANT%%/zabbix_proxy.conf
+zabbix_proxy.psk:/usr/local/etc/%%PLUGIN_VARIANT%%/zabbix_proxy.psk
diff --git a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in
similarity index 98%
rename from net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf
rename to net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in
index 266dc466c..d3b5ec258 100644
--- a/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf
+++ b/net-mgmt/zabbix-proxy/src/opnsense/service/templates/OPNsense/Zabbixproxy/zabbix_proxy.conf.in
@@ -79,7 +79,7 @@ TLSAccept=psk
 {% else %}
 TLSConnect=psk
 {% endif %}
-TLSPSKFile=/usr/local/etc/zabbix5/zabbix_proxy.psk
+TLSPSKFile=/usr/local/etc/%%PLUGIN_VARIANT%%/zabbix_proxy.psk
 TLSPSKIdentity={{ OPNsense.zabbixproxy.general.encryptionidentity }}
 {% endif %}
 {% endif %}