diff --git a/build/docker/images-build.sh b/build/docker/images-build.sh
index af6190468..daad63be0 100755
--- a/build/docker/images-build.sh
+++ b/build/docker/images-build.sh
@@ -2,18 +2,22 @@
 
 cd $(git rev-parse --show-toplevel)
 
-docker build -f build/docker/Dockerfile -t matrixdotorg/dendrite:latest .
+TAG=${1:-latest}
 
-docker build -t matrixdotorg/dendrite-monolith:latest          --build-arg component=dendrite-monolith-server          -f build/docker/Dockerfile.component .
+echo "Building tag '${TAG}'"
 
-docker build -t matrixdotorg/dendrite-appservice:latest        --build-arg component=dendrite-appservice-server        -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-clientapi:latest         --build-arg component=dendrite-client-api-server        -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-eduserver:latest         --build-arg component=dendrite-edu-server               -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-federationapi:latest     --build-arg component=dendrite-federation-api-server    -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-federationsender:latest  --build-arg component=dendrite-federation-sender-server -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-keyserver:latest         --build-arg component=dendrite-key-server               -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-mediaapi:latest          --build-arg component=dendrite-media-api-server         -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-roomserver:latest        --build-arg component=dendrite-room-server              -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-syncapi:latest           --build-arg component=dendrite-sync-api-server          -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-signingkeyserver:latest  --build-arg component=dendrite-signing-key-server       -f build/docker/Dockerfile.component .
-docker build -t matrixdotorg/dendrite-userapi:latest           --build-arg component=dendrite-user-api-server          -f build/docker/Dockerfile.component .
+docker build -f build/docker/Dockerfile -t matrixdotorg/dendrite:${TAG} .
+
+docker build -t matrixdotorg/dendrite-monolith:${TAG}          --build-arg component=dendrite-monolith-server          -f build/docker/Dockerfile.component .
+
+docker build -t matrixdotorg/dendrite-appservice:${TAG}        --build-arg component=dendrite-appservice-server        -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-clientapi:${TAG}         --build-arg component=dendrite-client-api-server        -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-eduserver:${TAG}         --build-arg component=dendrite-edu-server               -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-federationapi:${TAG}     --build-arg component=dendrite-federation-api-server    -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-federationsender:${TAG}  --build-arg component=dendrite-federation-sender-server -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-keyserver:${TAG}         --build-arg component=dendrite-key-server               -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-mediaapi:${TAG}          --build-arg component=dendrite-media-api-server         -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-roomserver:${TAG}        --build-arg component=dendrite-room-server              -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-syncapi:${TAG}           --build-arg component=dendrite-sync-api-server          -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-signingkeyserver:${TAG}  --build-arg component=dendrite-signing-key-server       -f build/docker/Dockerfile.component .
+docker build -t matrixdotorg/dendrite-userapi:${TAG}           --build-arg component=dendrite-user-api-server          -f build/docker/Dockerfile.component .
diff --git a/build/docker/images-pull.sh b/build/docker/images-pull.sh
index f49b9d6aa..e3284a2a6 100755
--- a/build/docker/images-pull.sh
+++ b/build/docker/images-pull.sh
@@ -1,15 +1,19 @@
 #!/bin/bash
 
-docker pull matrixdotorg/dendrite-monolith:latest
+TAG=${1:-latest}
 
-docker pull matrixdotorg/dendrite-appservice:latest
-docker pull matrixdotorg/dendrite-clientapi:latest
-docker pull matrixdotorg/dendrite-eduserver:latest
-docker pull matrixdotorg/dendrite-federationapi:latest
-docker pull matrixdotorg/dendrite-federationsender:latest
-docker pull matrixdotorg/dendrite-keyserver:latest
-docker pull matrixdotorg/dendrite-mediaapi:latest
-docker pull matrixdotorg/dendrite-roomserver:latest
-docker pull matrixdotorg/dendrite-syncapi:latest
-docker pull matrixdotorg/dendrite-signingkeyserver:latest
-docker pull matrixdotorg/dendrite-userapi:latest
+echo "Pulling tag '${TAG}'"
+
+docker pull matrixdotorg/dendrite-monolith:${TAG}
+
+docker pull matrixdotorg/dendrite-appservice:${TAG}
+docker pull matrixdotorg/dendrite-clientapi:${TAG}
+docker pull matrixdotorg/dendrite-eduserver:${TAG}
+docker pull matrixdotorg/dendrite-federationapi:${TAG}
+docker pull matrixdotorg/dendrite-federationsender:${TAG}
+docker pull matrixdotorg/dendrite-keyserver:${TAG}
+docker pull matrixdotorg/dendrite-mediaapi:${TAG}
+docker pull matrixdotorg/dendrite-roomserver:${TAG}
+docker pull matrixdotorg/dendrite-syncapi:${TAG}
+docker pull matrixdotorg/dendrite-signingkeyserver:${TAG}
+docker pull matrixdotorg/dendrite-userapi:${TAG}
diff --git a/build/docker/images-push.sh b/build/docker/images-push.sh
index 0246c9f03..e4eb773ac 100755
--- a/build/docker/images-push.sh
+++ b/build/docker/images-push.sh
@@ -1,15 +1,19 @@
 #!/bin/bash
 
-docker push matrixdotorg/dendrite-monolith:latest
+TAG=${1:-latest}
 
-docker push matrixdotorg/dendrite-appservice:latest
-docker push matrixdotorg/dendrite-clientapi:latest
-docker push matrixdotorg/dendrite-eduserver:latest
-docker push matrixdotorg/dendrite-federationapi:latest
-docker push matrixdotorg/dendrite-federationsender:latest
-docker push matrixdotorg/dendrite-keyserver:latest
-docker push matrixdotorg/dendrite-mediaapi:latest
-docker push matrixdotorg/dendrite-roomserver:latest
-docker push matrixdotorg/dendrite-syncapi:latest
-docker push matrixdotorg/dendrite-signingkeyserver:latest
-docker push matrixdotorg/dendrite-userapi:latest
+echo "Pushing tag '${TAG}'"
+
+docker push matrixdotorg/dendrite-monolith:${TAG}
+
+docker push matrixdotorg/dendrite-appservice:${TAG}
+docker push matrixdotorg/dendrite-clientapi:${TAG}
+docker push matrixdotorg/dendrite-eduserver:${TAG}
+docker push matrixdotorg/dendrite-federationapi:${TAG}
+docker push matrixdotorg/dendrite-federationsender:${TAG}
+docker push matrixdotorg/dendrite-keyserver:${TAG}
+docker push matrixdotorg/dendrite-mediaapi:${TAG}
+docker push matrixdotorg/dendrite-roomserver:${TAG}
+docker push matrixdotorg/dendrite-syncapi:${TAG}
+docker push matrixdotorg/dendrite-signingkeyserver:${TAG}
+docker push matrixdotorg/dendrite-userapi:${TAG}