diff --git a/ioBroker/Dockerfile b/ioBroker/Dockerfile
index cda9209..8e70d8f 100644
--- a/ioBroker/Dockerfile
+++ b/ioBroker/Dockerfile
@@ -1,4 +1,6 @@
-FROM buanet/iobroker:v5.1.0
+ARG BUILD_FROM=buanet/iobroker:v5.1.0
+FROM ${BUILD_FROM}
+
 # copy over the patched iobroker_startup.sh
 COPY iobroker_startup.sh /opt/scripts/iobroker_startup.sh
 RUN chmod a+x /opt/scripts/iobroker_startup.sh
diff --git a/ioBroker/build.json b/ioBroker/build.json
new file mode 100644
index 0000000..6e5b569
--- /dev/null
+++ b/ioBroker/build.json
@@ -0,0 +1,7 @@
+{
+    "build_from": {
+      "aarch64": "buanet/iobroker:v5.1.0-aarch64",
+      "amd64": "buanet/iobroker:v5.1.0-amd64",
+      "armv7": "buanet/iobroker:v5.1.0-armv7hf"
+    }
+  }
\ No newline at end of file
diff --git a/ioBroker/config.json b/ioBroker/config.json
index a65eaba..4d9f9ae 100644
--- a/ioBroker/config.json
+++ b/ioBroker/config.json
@@ -1,13 +1,14 @@
 {
     "name": "ioBroker",
-    "version": "0.5.0",
+    "version": "0.6.0",
+    "image": "maxwinterstein/homeassistant-addon-iobroker-{arch}",
     "webui": "http://[HOST]:[PORT:8081]/",
     "slug": "iobroker",
     "description": "Open source automation platform",
     "ingress": false,
     "ingress_port": 8081,
     "panel_icon": "mdi:iobroker",
-    "arch": ["armhf", "armv7", "aarch64", "amd64", "i386"],
+    "arch": ["armv7", "aarch64", "amd64"],
     "startup": "application",
     "boot": "auto",
     "options": {},
@@ -32,4 +33,4 @@
     "url": "https://github.com/MaxWinterstein/homeassistant-addons/",
     "hassio_role": "default",
     "hassio_api": true
-  }
\ No newline at end of file
+  }
diff --git a/ioBroker/helper-build-and-push.sh b/ioBroker/helper-build-and-push.sh
new file mode 100644
index 0000000..897cdeb
--- /dev/null
+++ b/ioBroker/helper-build-and-push.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+# see https://github.com/home-assistant/builder
+
+if [[ $1 = "push" ]]; then
+    echo 'build and push...'
+    sleep 5
+    echo -n Dockerhub password for maxwinterstein: 
+    read -s password
+    echo
+    docker run --privileged \
+        -v /var/run/docker.sock:/var/run/docker.sock:ro \
+        -v $PWD/:/data homeassistant/amd64-builder \
+        --all -t /data --docker-user maxwinterstein --docker-password $password #--docker-hub-check
+elif [[ $1 = "test" ]]; then
+    echo 'Just testing all...'
+    sleep 5
+    docker run --privileged -v ~/.docker:/root/.docker \
+        -v /var/run/docker.sock:/var/run/docker.sock:ro \
+        -v $PWD/:/data homeassistant/amd64-builder \
+        --all --test -t /data
+else
+    echo 'Just testing all...'
+    sleep 5
+    docker run --privileged -v ~/.docker:/root/.docker \
+        -v /var/run/docker.sock:/var/run/docker.sock:ro \
+        -v $PWD/:/data homeassistant/amd64-builder \
+        --amd64 --test -t /data
+fi