diff --git a/zabbix-agent2/build.yaml b/zabbix-agent2/build.yaml
new file mode 100644
index 0000000..32b8164
--- /dev/null
+++ b/zabbix-agent2/build.yaml
@@ -0,0 +1,8 @@
+---
+build_from:
+  aarch64: ghcr.io/hassio-addons/base:16.1.0
+  amd64: ghcr.io/hassio-addons/base:16.1.0
+  armv7: ghcr.io/hassio-addons/base:16.1.0
+codenotary:
+  base_image: codenotary@frenck.dev
+  signer: codenotary@frenck.dev
\ No newline at end of file
diff --git a/zabbix-agent2/config.yaml b/zabbix-agent2/config.yaml
index a73c2ab..0497b67 100644
--- a/zabbix-agent2/config.yaml
+++ b/zabbix-agent2/config.yaml
@@ -20,7 +20,6 @@ host_pid: true
 host_network: true
 docker_api: true
 advanced: true
-legacy: true
 map:
   - addon_config:rw
 ports:
diff --git a/zabbix-agent2/rootfs/run.sh b/zabbix-agent2/rootfs/run.sh
index 7ee5994..953f16f 100644
--- a/zabbix-agent2/rootfs/run.sh
+++ b/zabbix-agent2/rootfs/run.sh
@@ -9,4 +9,5 @@ if ! bashio::fs.file_exists "${ZBX_CFG_FILE}" || [ -z "$(ls -A ${ZBX_CFG_FILE})"
 fi
 
 # Run zabbix-agent2 in foreground
-zabbix_agent2 --foreground -c /config/zabbix_agent2.conf
+# zabbix_agent2 --foreground -c /config/zabbix_agent2.conf
+exec /etc/services.d/zabbix_agent2/run
\ No newline at end of file