diff --git a/README.md b/README.md
index 8d13ed2..b1672d7 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ FN0IX6Z7106y3qPUktG2f+cCAwEAAQ==
 
 Building from source is also possible; the original guide is at the end of this document.
 
-**Note:** in April 2024 the `MACHINE` variable in `/etc/hassio.json` created by this package was changed to reflect the correct system architecture. Upgrading to `hassio-supervised` v1.7.0 or newer will automatically rewrite that file.
+**Note:** in April 2024 the `MACHINE` variable in `/etc/hassio.json` created by this package was changed to reflect the correct system architecture. Upgrading to `hassio-supervised` v1.7.0 or newer will automatically rewrite that file with every update.
 
 ## Prerequisites
 
diff --git a/hassio-supervised/APKBUILD b/hassio-supervised/APKBUILD
index 5e6f488..d5489ca 100644
--- a/hassio-supervised/APKBUILD
+++ b/hassio-supervised/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer:
 pkgname=hassio-supervised
 pkgver=1.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Home Assistant Supervised"
 url="https://github.com/home-assistant/supervised-installer"
 arch="noarch"
diff --git a/hassio-supervised/hassio-supervised.post-install b/hassio-supervised/hassio-supervised.post-install
index a1ee30f..b98791a 100644
--- a/hassio-supervised/hassio-supervised.post-install
+++ b/hassio-supervised/hassio-supervised.post-install
@@ -23,23 +23,23 @@ done
 
 case ${ARCH} in
 	"i386" | "i686")
-		MACHINE=${MACHINE:=i386}
+		MACHINE=${MACHINE:=qemux86}
 		HASSIO_DOCKER="${DOCKER_REPO}/i386-hassio-supervisor"
 	;;
 	"x86_64")
-		MACHINE=${MACHINE:=amd64}
+		MACHINE=${MACHINE:=qemux86-64}
 		HASSIO_DOCKER="${DOCKER_REPO}/amd64-hassio-supervisor"
 	;;
 	"arm" |"armv6l")
-		MACHINE=${MACHINE:=armhf}
+		MACHINE=${MACHINE:=qemuarm}
 		HASSIO_DOCKER="${DOCKER_REPO}/armhf-hassio-supervisor"
 	;;
 	"armv7l")
-		MACHINE=${MACHINE:=armv7}
+		MACHINE=${MACHINE:=raspberrypi2}
 		HASSIO_DOCKER="${DOCKER_REPO}/armv7-hassio-supervisor"
 	;;
 	"aarch64")
-		MACHINE=${MACHINE:=aarch64}
+		MACHINE=${MACHINE:=qemuarm-64}
 		HASSIO_DOCKER="${DOCKER_REPO}/aarch64-hassio-supervisor"
 	;;
 	*)
diff --git a/hassio-supervised/hassio-supervised.post-upgrade b/hassio-supervised/hassio-supervised.post-upgrade
index a1ee30f..b98791a 100644
--- a/hassio-supervised/hassio-supervised.post-upgrade
+++ b/hassio-supervised/hassio-supervised.post-upgrade
@@ -23,23 +23,23 @@ done
 
 case ${ARCH} in
 	"i386" | "i686")
-		MACHINE=${MACHINE:=i386}
+		MACHINE=${MACHINE:=qemux86}
 		HASSIO_DOCKER="${DOCKER_REPO}/i386-hassio-supervisor"
 	;;
 	"x86_64")
-		MACHINE=${MACHINE:=amd64}
+		MACHINE=${MACHINE:=qemux86-64}
 		HASSIO_DOCKER="${DOCKER_REPO}/amd64-hassio-supervisor"
 	;;
 	"arm" |"armv6l")
-		MACHINE=${MACHINE:=armhf}
+		MACHINE=${MACHINE:=qemuarm}
 		HASSIO_DOCKER="${DOCKER_REPO}/armhf-hassio-supervisor"
 	;;
 	"armv7l")
-		MACHINE=${MACHINE:=armv7}
+		MACHINE=${MACHINE:=raspberrypi2}
 		HASSIO_DOCKER="${DOCKER_REPO}/armv7-hassio-supervisor"
 	;;
 	"aarch64")
-		MACHINE=${MACHINE:=aarch64}
+		MACHINE=${MACHINE:=qemuarm-64}
 		HASSIO_DOCKER="${DOCKER_REPO}/aarch64-hassio-supervisor"
 	;;
 	*)