diff --git a/.drone.yml b/.drone.yml
index 6ad71e8..78df3e3 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -2,20 +2,38 @@ kind: pipeline
 type: docker
 name: default
 
+platform:
+  arch: amd64
+  os: linux
+
 steps:
+  - name: build
+    image: plugins/docker:linux-amd64
+    settings:
+      dockerfile: Dockerfile.amd64
+      dry_run: true
+      repo: docker.asperti.com/paspo/hassio-zabbix-agent2
+    when:
+      event:
+        - push
+
   - name: build_and_publish
     image: plugins/docker:linux-amd64
     settings:
+      dockerfile: Dockerfile.amd64
       password:
         from_secret: docker_password
       registry: docker.asperti.com
       repo: docker.asperti.com/paspo/hassio-zabbix-agent2
       tags:
-        - latest
-        - ${DRONE_TAG}
-        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}
+        - latest-amd64
+        - ${DRONE_TAG}-amd64
+        - ${DRONE_SEMVER_MAJOR}.${DRONE_SEMVER_MINOR}-amd64
       username:
         from_secret: docker_username
+    when:
+      event:
+        - tag
 
 trigger:
   event:
diff --git a/Dockerfile b/Dockerfile.amd64
similarity index 52%
rename from Dockerfile
rename to Dockerfile.amd64
index 859c079..57752a9 100644
--- a/Dockerfile
+++ b/Dockerfile.amd64
@@ -1,4 +1,4 @@
-ARG BUILD_FROM=hassioaddons/base:8.0.6
+ARG BUILD_FROM=ghcr.io/hassio-addons/base/amd64:12.0.0
 FROM $BUILD_FROM
 
 ENV LANG C.UTF-8
@@ -6,7 +6,7 @@ ENV LANG C.UTF-8
 # Copy scripts for add-on
 COPY run.sh /
 
-RUN apk add -U jq zabbix-agent2=5.0.14-r1 sudo && \
+RUN apk add -U jq zabbix-agent2=6.0.5-r0 sudo && \
   chmod a+x /run.sh
 
 CMD [ "/run.sh" ]