diff --git a/build-scripts/hassio-supervisor/create_hassio_supervisor.sh b/build-scripts/hassio-supervisor/create_hassio_supervisor.sh
index 6a0850076..f58e436fe 100755
--- a/build-scripts/hassio-supervisor/create_hassio_supervisor.sh
+++ b/build-scripts/hassio-supervisor/create_hassio_supervisor.sh
@@ -64,63 +64,8 @@ docker run --rm \
     pvizeli/docker-build-env \
     /run-docker.sh
 
-exit
-# Write deploy artifacts
-BUILD_DEPLOY_DIR=$WORKSPACE/deploy
-DEVICE_TYPE_JSON=$WORKSPACE/$MACHINE.json
-VERSION_HOSTOS=$(cat $WORKSPACE/build/tmp/deploy/images/$MACHINE/VERSION_HOSTOS)
+echo "[INFO] cleanup WORKSPACE"
+rm -rf $WORKSPACE
 
-DEPLOY_ARTIFACT=$(jq --raw-output '.yocto.deployArtifact' $DEVICE_TYPE_JSON)
-COMPRESSED=$(jq --raw-output '.yocto.compressed' $DEVICE_TYPE_JSON)
-ARCHIVE=$(jq --raw-output '.yocto.archive' $DEVICE_TYPE_JSON)
-mkdir -p $BUILD_DEPLOY_DIR
-rm -rf $BUILD_DEPLOY_DIR/* # do we have anything there?
-mv -v $(readlink --canonicalize $WORKSPACE/build/tmp/deploy/images/$MACHINE/$DEPLOY_ARTIFACT) $BUILD_DEPLOY_DIR/$DEPLOY_ARTIFACT
-if [ "${COMPRESSED}" == 'true' ]; then
-	if [ "${ARCHIVE}" == 'true' ]; then
-		(cd $BUILD_DEPLOY_DIR && tar --remove-files  --use-compress-program pigz --directory=$DEPLOY_ARTIFACT -cvf ${DEPLOY_ARTIFACT}.tar.gz .)
-	else
-		 mv $BUILD_DEPLOY_DIR/$DEPLOY_ARTIFACT $BUILD_DEPLOY_DIR/resin.img
-		(cd $BUILD_DEPLOY_DIR && tar --remove-files --use-compress-program pigz -cvf resin.img.tar.gz resin.img)
-	fi
-fi
-if [ -f $(readlink --canonicalize $WORKSPACE/build/tmp/deploy/images/$MACHINE/resin-image-$MACHINE.resinhup-tar) ]; then
-    mv -v $(readlink --canonicalize $WORKSPACE/build/tmp/deploy/images/$MACHINE/resin-image-$MACHINE.resinhup-tar) $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar
-else
-    echo "WARNING: No resinhup package found."
-fi
-
-mv -v $WORKSPACE/build/tmp/deploy/images/$MACHINE/VERSION $BUILD_DEPLOY_DIR
-mv -v $WORKSPACE/build/tmp/deploy/images/$MACHINE/VERSION_HOSTOS $BUILD_DEPLOY_DIR
-cp $DEVICE_TYPE_JSON $BUILD_DEPLOY_DIR/device-type.json
-# move to deploy directory the kernel modules headers so we have it as a build artifact in jenkins
-mv -v $WORKSPACE/build/tmp/deploy/images/$MACHINE/kernel_modules_headers.tar.gz $BUILD_DEPLOY_DIR
-
-# If this is a clean production build, push a resinhup package to dockerhub
-# and registry.resinstaging.io.
-if [[ "$sourceBranch" == production* ]] && [ "$metaResinBranch" == "__ignore__" ] && [ "$supervisorTag" == "__ignore__" ]; then
-    echo "INFO: Pushing resinhup package to dockerhub and registry.resinstaging.io."
-    SLUG=$(jq --raw-output '.slug' $DEVICE_TYPE_JSON)
-    DOCKER_REPO="resin/resinos"
-    DOCKER_TAG="$VERSION_HOSTOS-$SLUG"
-    RESINREG_REPO="registry.resinstaging.io/resin/resinos"
-    RESINREG_TAG="$VERSION_HOSTOS-$SLUG"
-    if [ -f $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar ]; then
-        docker import $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar $DOCKER_REPO:$DOCKER_TAG
-        docker push $DOCKER_REPO:$DOCKER_TAG
-        docker rmi $DOCKER_REPO:$DOCKER_TAG # cleanup
-
-        docker import $BUILD_DEPLOY_DIR/resinhup-$VERSION_HOSTOS.tar $RESINREG_REPO:$RESINREG_TAG
-        docker push $RESINREG_REPO:$RESINREG_TAG
-        docker rmi $RESINREG_REPO:$RESINREG_TAG # cleanup
-    else
-        echo "ERROR: The build didn't produce a resinhup package."
-        exit 1
-    fi
-else
-    echo "WARNING: There is no need to upload resinhup package for a non production clean build."
-fi
-
-# Cleanup the build directory
-# Keep this after writing all artifacts
-rm -rf $WORKSPACE/build
+cleanup
+exit 0