diff --git a/meta-hassio/recipes-support/resinhup/resinhup.bbappend b/meta-hassio/recipes-support/resinhup/resinhup.bbappend
index 693b19d31..032d47e4a 100644
--- a/meta-hassio/recipes-support/resinhup/resinhup.bbappend
+++ b/meta-hassio/recipes-support/resinhup/resinhup.bbappend
@@ -1,7 +1,8 @@
 
 FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += " \
+SRC_URI = " \
+    file://resinhup \
     file://hassio.conf \
     file://resinhup.timer \
     file://resinhup.service \
@@ -27,6 +28,9 @@ do_install_append() {
     install -m 0755 ${WORKDIR}/hassio.conf ${D}${sysconfdir}
     sed -i -e 's:@HASSIO_VERSION@:${HASSIO_VERSION}:g' ${D}${sysconfdir}/hassio.conf
 
+    install -d ${D}${bindir}
+    install -m 0755 ${WORKDIR}/resinhup ${D}${bindir}
+
     if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then
         install -d ${D}${systemd_unitdir}/system
         install -c -m 0644 ${WORKDIR}/resinhup.service ${D}${systemd_unitdir}/system
diff --git a/meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh b/meta-hassio/recipes-support/resinhup/resinhup/resinhup
similarity index 99%
rename from meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
rename to meta-hassio/recipes-support/resinhup/resinhup/resinhup
index b86b362b6..e0b787dbb 100644
--- a/meta-hassio/recipes-support/resinhup/resinhup/run-resinhup.sh
+++ b/meta-hassio/recipes-support/resinhup/resinhup/resinhup
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 # Default values
 LOGFILE=/tmp/`basename "$0"`.log
 LOG=yes
@@ -299,7 +301,7 @@ log "Running resinhup for version $HOSTOS_VERSION ..."
 RESINHUP_STARTTIME=$(date +%s)
 
 # Set options
-RESINHUP_ENV="-e VERSION=$HOSTOS_VERSION -e REMOTE=$DOCKER_REPO/hassio"
+RESINHUP_ENV="-e VERSION=$HOSTOS_VERSION-$MACHINE -e REMOTE=$DOCKER_REPO/hassio"
 
 docker run --privileged --rm --net=host $RESINHUP_ENV \
     -v /:/host \
diff --git a/meta-hassio/recipes-support/resinhup/resinhup/resinhup.service b/meta-hassio/recipes-support/resinhup/resinhup/resinhup.service
index c97372eff..d083ef62b 100644
--- a/meta-hassio/recipes-support/resinhup/resinhup/resinhup.service
+++ b/meta-hassio/recipes-support/resinhup/resinhup/resinhup.service
@@ -16,4 +16,4 @@ After=\
 
 [Service]
 Type=simple
-ExecStart=@BASE_BINDIR@/bash @BINDIR@/run-resinhub.sh
+ExecStart=@BASE_BINDIR@/bash @BINDIR@/resinhub