diff --git a/build-scripts/resinos-build/create_resinos.sh b/build-scripts/resinos-build/create_resinos.sh
index 82c4626fa..b79546d7a 100755
--- a/build-scripts/resinos-build/create_resinos.sh
+++ b/build-scripts/resinos-build/create_resinos.sh
@@ -43,20 +43,10 @@ RESIN_BRANCH=${RESIN_BRANCH:=master}
 
 # evaluate git repo and arch
 case $MACHINE in
-    "raspberrypi")
+    "raspberrypi", "raspberrypi2", "raspberrypi3")
         ARCH="armhf"
         RESIN_REPO="https://github.com/resin-os/resin-raspberrypi"
-        HOMEASSISTANT_REPOSITORY="$DOCKER_REPO/raspberrypi-homeassistant"
-    ;;
-    "raspberrypi2")
-        ARCH="armhf"
-        RESIN_REPO="https://github.com/resin-os/resin-raspberrypi"
-        HOMEASSISTANT_REPOSITORY="$DOCKER_REPO/raspberrypi2-homeassistant"
-    ;;
-    "raspberrypi3")
-        ARCH="armhf"
-        RESIN_REPO="https://github.com/resin-os/resin-raspberrypi"
-        HOMEASSISTANT_REPOSITORY="$DOCKER_REPO/raspberrypi3-homeassistant"
+        HOMEASSISTANT_REPOSITORY="$DOCKER_REPO/$MACHINE-homeassistant"
     ;;
     *)
         echo "[ERROR] ${MACHINE} unknown!"