diff --git a/contrib/ci-builders/Dockerfile-bbworker.apt b/contrib/ci-builders/Dockerfile-bbworker.apt
index 89e00ffb1..40ee4b8a4 100644
--- a/contrib/ci-builders/Dockerfile-bbworker.apt
+++ b/contrib/ci-builders/Dockerfile-bbworker.apt
@@ -1,6 +1,6 @@
 ARG FROMBASEOS
 ARG FROMBASEOS_BUILD_TAG=latest
-FROM electriccoinco/zcashd-build:$FROMBASEOS$FROMBASEOS_BUILD_TAG
+FROM electriccoinco/zcashd-build-$FROMBASEOS$FROMBASEOS_BUILD_TAG
 
 ARG DUMBINIT_VERSION=1.2.2
 RUN wget -O /usr/bin/dumb-init https://github.com/Yelp/dumb-init/releases/download/v${DUMBINIT_VERSION}/dumb-init_${DUMBINIT_VERSION}_amd64
diff --git a/contrib/ci-builders/Dockerfile-bbworker.arch b/contrib/ci-builders/Dockerfile-bbworker.arch
index fe2664fb0..c3e6ff9d7 100644
--- a/contrib/ci-builders/Dockerfile-bbworker.arch
+++ b/contrib/ci-builders/Dockerfile-bbworker.arch
@@ -12,15 +12,11 @@ RUN useradd --home-dir /home/$BUILDBOT_USER \
 USER $BUILDBOT_USER
 WORKDIR /home/$BUILDBOT_USER
 
+ADD bbworker-requirements.txt requirements.txt
 RUN python -m venv venv \
     && . venv/bin/activate \
-    && python -m pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
+    && python -m pip install wheel \
+    && python -m pip install -r requirements.txt
 
 # Buildbot worker
 ARG BUILDBOT_WORKER_NAME=arch-docker
diff --git a/contrib/ci-builders/Dockerfile-bbworker.centos8 b/contrib/ci-builders/Dockerfile-bbworker.centos8
index eb1db9484..fbc02101b 100644
--- a/contrib/ci-builders/Dockerfile-bbworker.centos8
+++ b/contrib/ci-builders/Dockerfile-bbworker.centos8
@@ -12,15 +12,11 @@ RUN useradd --home-dir /home/$BUILDBOT_USER \
 USER $BUILDBOT_USER
 WORKDIR /home/$BUILDBOT_USER
 
+ADD bbworker-requirements.txt requirements.txt
 RUN python3 -m venv venv \
     && . venv/bin/activate \
-    && python3 -m pip install \
-       buildbot-worker \
-       pyflakes \
-       pyblake2 \
-       pyzmq \
-       requests \
-       twisted[tls]
+    && python -m pip install wheel \
+    && python -m pip install -r requirements.txt
 
 # Buildbot worker
 ARG BUILDBOT_WORKER_NAME=centos8-docker
diff --git a/contrib/ci-builders/Dockerfile-gitian.apt b/contrib/ci-builders/Dockerfile-gitian.apt
index 247262c17..5ca2a8757 100644
--- a/contrib/ci-builders/Dockerfile-gitian.apt
+++ b/contrib/ci-builders/Dockerfile-gitian.apt
@@ -1,6 +1,6 @@
 ARG FROMBASEOS
 ARG FROMBASEOS_BUILD_TAG=latest
-FROM electriccoinco/zcashd-build:$FROMBASEOS$FROMBASEOS_BUILD_TAG
+FROM electriccoinco/zcashd-build-$FROMBASEOS$FROMBASEOS_BUILD_TAG
 
 RUN useradd -ms /bin/bash -U debian
 USER debian:debian
diff --git a/contrib/ci-builders/docker-build.sh b/contrib/ci-builders/docker-build.sh
index ec34cf4e0..2be7f007d 100755
--- a/contrib/ci-builders/docker-build.sh
+++ b/contrib/ci-builders/docker-build.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+set -exo pipefail
 # Debian
 docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=9 -t electriccoinco/zcashd-build-debian9
 docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=debian --build-arg FROMBASEOS_BUILD_TAG=10 -t electriccoinco/zcashd-build-debian10
@@ -18,23 +20,29 @@ docker push electriccoinco/zcashd-bbworker-debian9
 docker push electriccoinco/zcashd-bbworker-debian10
 
 # Ubuntu
-docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-build-ubuntu18.04
-docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build-ubuntu20.04
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=16.04 -t electriccoinco/zcashd-build-ubuntu1604
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-build-ubuntu1804
+docker build . -f Dockerfile-build.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-build-ubuntu2004
 
-docker push electriccoinco/zcashd-build-ubuntu18.04
-docker push electriccoinco/zcashd-build-ubuntu20.04
+docker push electriccoinco/zcashd-build-ubuntu1604
+docker push electriccoinco/zcashd-build-ubuntu1804
+docker push electriccoinco/zcashd-build-ubuntu2004
 
-docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-gitian-ubuntu18.04
-docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-gitian-ubuntu20.04
+docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1604 -t electriccoinco/zcashd-gitian-ubuntu1604
+docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-gitian-ubuntu1804
+docker build . -f Dockerfile-gitian.apt --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-gitian-ubuntu2004
 
-docker push electriccoinco/zcashd-gitian-ubuntu18.04
-docker push electriccoinco/zcashd-gitian-ubuntu20.04
+docker push electriccoinco/zcashd-gitian-ubuntu1604
+docker push electriccoinco/zcashd-gitian-ubuntu1804
+docker push electriccoinco/zcashd-gitian-ubuntu2004
 
-docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=18.04 -t electriccoinco/zcashd-bbworker-ubuntu18.04
-docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=20.04 -t electriccoinco/zcashd-bbworker-ubuntu20.04
+docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1604 -t electriccoinco/zcashd-bbworker-ubuntu1604
+docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=1804 -t electriccoinco/zcashd-bbworker-ubuntu1804
+docker build . -f Dockerfile-bbworker.apt --build-arg BASEOS=ubuntu --build-arg FROMBASEOS=ubuntu --build-arg FROMBASEOS_BUILD_TAG=2004 -t electriccoinco/zcashd-bbworker-ubuntu2004
 
-docker push electriccoinco/zcashd-bbworker-ubuntu18.04
-docker push electriccoinco/zcashd-bbworker-ubuntu20.04
+docker push electriccoinco/zcashd-bbworker-ubuntu1604
+docker push electriccoinco/zcashd-bbworker-ubuntu1804
+docker push electriccoinco/zcashd-bbworker-ubuntu2004
 
 # Centos
 docker build . -f Dockerfile-build.centos8 -t electriccoinco/zcashd-build-centos8