diff --git a/Dockerfile-clustertests b/Dockerfile-clustertests
index 66fe174e9..91fde88fb 100644
--- a/Dockerfile-clustertests
+++ b/Dockerfile-clustertests
@@ -1,7 +1,7 @@
 # This Dockerfile is used for cluster testing - it produces a much larger image
 # and includes all of Go as well as some utilities.
 
-FROM golang:1.13
+FROM golang:1.16
 
 LABEL maintainer "dev@pilosa.com"
 
diff --git a/Makefile b/Makefile
index 3db1059cc..335685187 100644
--- a/Makefile
+++ b/Makefile
@@ -135,7 +135,7 @@ DOCKER_COMPOSE=internal/clustertests/docker-compose.yml
 # pilosa image.
 clustertests: vendor
 	docker-compose -f $(DOCKER_COMPOSE) down
-	docker-compose -f $(DOCKER_COMPOSE) build client1
+	docker-compose -f $(DOCKER_COMPOSE) build
 	docker-compose -f $(DOCKER_COMPOSE) up --exit-code-from=client1
 
 
@@ -143,7 +143,7 @@ DOCKER_COMPOSE_INDEX_KEY_REPLICATION=internal/clustertests/docker-compose-index-
 # Check clustertests target for more info
 clustertests-index-key-replication: vendor
 	docker-compose -f $(DOCKER_COMPOSE_INDEX_KEY_REPLICATION) down
-	docker-compose -f $(DOCKER_COMPOSE_INDEX_KEY_REPLICATION) build client1
+	docker-compose -f $(DOCKER_COMPOSE_INDEX_KEY_REPLICATION) build
 	docker-compose -f $(DOCKER_COMPOSE_INDEX_KEY_REPLICATION) up --exit-code-from=client1
 
 # Like clustertests, but rebuilds all images.