diff --git a/build-scripts/resinos-build/create_resinos.sh b/build-scripts/resinos-build/create_resinos.sh
index c5ce749bf..8437b113b 100755
--- a/build-scripts/resinos-build/create_resinos.sh
+++ b/build-scripts/resinos-build/create_resinos.sh
@@ -51,6 +51,8 @@ case $MACHINE in
     ;;
 esac
 
+HASSIO_SUPERVISOR=pvizeli/${ARCH}-hassio-supervisor
+
 echo "[INFO] Checkout repository"
 mkdir -p $BUILD_DIR
 cd $BUILD_DIR && git clone $RESIN_REPO resin-board
@@ -59,10 +61,8 @@ if [ $RESIN_BRANCH != "master" ]; then
 fi
 cd $WORKSPACE && git submodule update --init --recursive
 
-# When supervisorTag is provided, you the appropiate barys argument
-if [ "$supervisorTag" != "" ]; then
-    BARYS_ARGUMENTS_VAR="$BARYS_ARGUMENTS_VAR --supervisor-tag $supervisorTag"
-fi
+# Additional variables
+BARYS_ARGUMENTS_VAR="-a RESIN_CONNECTABLE=0 -a DEVELOPMENT_IMAGE=0 -a $HASSIO_SUPERVISOR"
 
 # Make sure shared directories are in place
 mkdir -p $DOWNLOAD_DIR
diff --git a/supervisor/Dockerfile b/supervisor/Dockerfile
index 56a275d86..ad6f0bb9e 100644
--- a/supervisor/Dockerfile
+++ b/supervisor/Dockerfile
@@ -8,7 +8,7 @@ RUN apk del --no-cache python*
 ENV LANG C.UTF-8
 
 # setup base
-RUN apk add --no-cache python3
+RUN apk add --no-cache python3 docker
 
 # install aiohttp
 RUN pip3 install pip --no-cache --upgrade && pip3 install --no-cache aiohttp