diff --git a/zabbix-agent2/Dockerfile b/zabbix-agent2/Dockerfile
index 729185c..c77ab23 100644
--- a/zabbix-agent2/Dockerfile
+++ b/zabbix-agent2/Dockerfile
@@ -5,7 +5,7 @@ ARG BUILD_BASE_IMAGE=zabbix/zabbix-build-mysql:alpine-${ZBX_VERSION}
 FROM ${BUILD_BASE_IMAGE} AS builder
 
 # FROM alpine:3.19
-FROM ghcr.io/hassio-addons/debian-base/amd64
+FROM homeassistant/amd64-base:latest
 
 ARG MAJOR_VERSION
 ARG ZBX_VERSION
diff --git a/zabbix-agent2/config.yaml b/zabbix-agent2/config.yaml
index 6ac5ef9..56d8a88 100644
--- a/zabbix-agent2/config.yaml
+++ b/zabbix-agent2/config.yaml
@@ -5,7 +5,11 @@ slug: zabbix-agent2
 description: Zabbix agent 2
 url: https://gitea.sinav-lab.com/sinav/haos-addons
 arch:
+  - armhf
+  - armv7
+  - aarch64
   - amd64
+  - i386
 startup: system
 boot: auto
 init: false