diff --git a/build-scripts/resinhup-build/create_resinhup.sh b/build-scripts/resinhup-build/create_resinhup.sh
index e6b316013..da38e3ddf 100644
--- a/build-scripts/resinhup-build/create_resinhup.sh
+++ b/build-scripts/resinhup-build/create_resinhup.sh
@@ -32,9 +32,10 @@ SCRIPTPATH=`pwd`
 popd > /dev/null 2>&1
 
 MACHINE=$2
+RESINHUP_VER=$1
 BASE_IMAGE="resin\/${MACHINE}-python:3.6"
-DOCKER_TAG=$1
-DOCKER_IMAGE=resinhup-${MACHINE}
+DOCKER_TAG=${MACHINE}-${RESINHUP_VER}
+DOCKER_IMAGE=resinhup
 BUILD_DIR=${BUILD_DIR:=$SCRIPTPATH}
 WORKSPACE=${BUILD_DIR:=$SCRIPTPATH}/resinhup