diff --git a/deconz/CHANGELOG.md b/deconz/CHANGELOG.md
index 06f4540..2c3753c 100644
--- a/deconz/CHANGELOG.md
+++ b/deconz/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 6.1.0
+
+- Fix issue with armhf / move back to raspbian
+- Add wiringPi to aarch64
+
 ## 6.0.1
 
 - Fix wiringPi and built it from source
diff --git a/deconz/Dockerfile b/deconz/Dockerfile
index 0d28971..2b50d10 100644
--- a/deconz/Dockerfile
+++ b/deconz/Dockerfile
@@ -32,7 +32,7 @@ RUN apt-get update \
         xfonts-base \
         xfonts-scalable \
     && rm -rf /var/lib/apt/lists/* \
-    && if [ "${BUILD_ARCH}" = "armhf" ]; \
+    && if [[ "armhf aarch64" = *"$BUILD_ARCH"* ]]; \
         then \
             apt-get update \
             && apt-get install -y --no-install-recommends \
diff --git a/deconz/build.json b/deconz/build.json
index b308a09..ea79813 100644
--- a/deconz/build.json
+++ b/deconz/build.json
@@ -2,7 +2,7 @@
   "build_from": {
     "aarch64": "homeassistant/aarch64-base-debian:buster",
     "amd64": "homeassistant/amd64-base-debian:buster",
-    "armhf": "homeassistant/armhf-base-debian:buster"
+    "armhf": "homeassistant/armhf-base-raspbian:buster"
   },
   "args": {
     "DECONZ_VERSION": "2.05.79"
diff --git a/deconz/config.json b/deconz/config.json
index 03585bd..b1a67da 100644
--- a/deconz/config.json
+++ b/deconz/config.json
@@ -1,6 +1,6 @@
 {
   "name": "deCONZ",
-  "version": "6.0.1",
+  "version": "6.1.0",
   "slug": "deconz",
   "description": "Control a Zigbee network with ConBee or RaspBee by Dresden Elektronik",
   "arch": ["amd64", "armhf", "aarch64"],