diff --git a/Dockerfile.py b/Dockerfile.py
index 749db9a..b4e36d8 100755
--- a/Dockerfile.py
+++ b/Dockerfile.py
@@ -50,8 +50,9 @@ def run_and_stream_command_output(command, environment_vars, verbose):
                 print(line, end='')
     build_result.wait()
     if build_result.returncode != 0:
-        print("     ::: Error running".format(command))
+        print("     ::: Error running {}".format(command))
         print(build_result.stderr)
+        sys.exit(build_resuilt.returncode)
 
 
 def build(docker_repo: str, arch: str, debian_version: str, hub_tag: str, show_time: bool, no_cache: bool, verbose: bool):
diff --git a/Dockerfile.sh b/Dockerfile.sh
index 9f9d8d7..76ae6e0 100755
--- a/Dockerfile.sh
+++ b/Dockerfile.sh
@@ -5,7 +5,7 @@
 # @param ${ARCH_IMAGE}       What the Docker Hub Image should be tagged as [default: None]
 
 set -eux
-./Dockerfile.py -v --arch="${ARCH}" --debian="${DEBIAN_VERSION}" --hub_tag="${ARCH_IMAGE}"
+./Dockerfile.py -v --no-cache --arch="${ARCH}" --debian="${DEBIAN_VERSION}" --hub_tag="${ARCH_IMAGE}"
 docker images
 
 # TODO: Add junitxml output and have something consume it
diff --git a/Dockerfile_build b/Dockerfile_build
index e40f551..70e5a28 100644
--- a/Dockerfile_build
+++ b/Dockerfile_build
@@ -3,9 +3,10 @@ FROM python:buster
 # Only works for docker CLIENT (bind mounted socket)
 COPY --from=docker:18.09.3 /usr/local/bin/docker /usr/local/bin/
 
+ARG packages
 RUN apt-get update && \
     apt-get install -y python3-dev curl gcc make \
-        libffi-dev libssl-dev \
+        libffi-dev libssl-dev ${packages} \
     && pip3 install -U pip pipenv
 
 RUN curl -L https://github.com/docker/compose/releases/download/1.25.5/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
diff --git a/VERSION b/VERSION
index 5e0a0f1..346d9ca 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-v5.0
+v5.1.1
diff --git a/circle-test.sh b/circle-test.sh
index 38ff736..8b61499 100755
--- a/circle-test.sh
+++ b/circle-test.sh
@@ -12,6 +12,7 @@ if [[ "$1" == "enter" ]]; then
 fi
 
 # generate and build dockerfile
+docker pull python:buster
 docker build -t image_pipenv -f Dockerfile_build .
 env > /tmp/env
 docker run --rm \
diff --git a/install.sh b/install.sh
index 8b8f40f..11fe442 100644
--- a/install.sh
+++ b/install.sh
@@ -4,7 +4,7 @@ mkdir -p /etc/pihole/
 mkdir -p /var/run/pihole
 # Production tags with valid web footers
 export CORE_VERSION="$(cat /etc/docker-pi-hole-version)"
-export WEB_VERSION="${CORE_VERSION}"
+export WEB_VERSION="v5.1"
 
 # Only use for pre-production / testing
 export CHECKOUT_BRANCHES=false
@@ -18,6 +18,7 @@ apt-get install --no-install-recommends -y curl procps ca-certificates
 # curl in armhf-buster's image has SSL issues. Running c_rehash fixes it.
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=923479
 c_rehash
+ln -s `which echo` /usr/local/bin/whiptail
 curl -L -s $S6OVERLAY_RELEASE | tar xvzf - -C /
 mv /init /s6-init