diff --git a/Makefile b/Makefile
index b9f328a..ae49939 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@ builder: Dockerfile.builder
 	docker build -t ${IMAGE_PREFIX}-$@ -f Dockerfile.$@ .
 
 master: Dockerfile build/git-refs.txt agent-templates proxy
-	docker build -t ${IMAGE_PREFIX}-$@  .
+	docker build -t ${IMAGE_PREFIX}  .
 
 proxy:
 	$(MAKE) -C proxy container
diff --git a/scripts/build-plugin b/scripts/build-plugin
index 95c967e..48ff4a1 100755
--- a/scripts/build-plugin
+++ b/scripts/build-plugin
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-BUILDER_CONTAINER="rtyler/codevalet-builder"
+BUILDER_CONTAINER="codevalet/master-builder"
 
 if [ "${1}" = "" ]; then
   echo "The path to a plugin must be passed as the first argument";
diff --git a/scripts/build-plugins b/scripts/build-plugins
index b2ac0e0..a126b7b 100755
--- a/scripts/build-plugins
+++ b/scripts/build-plugins
@@ -4,7 +4,6 @@ BUILD_DIR=$PWD/build
 REPOS_DIR=$BUILD_DIR/repos
 SCRIPTS_DIR=$(realpath $(dirname $0))
 PLUGINS_OUTPUT_DIR=$BUILD_DIR/plugins
-BUILDER_CONTAINER="rtyler/codevalet-builder"
 PATH=${SCRIPTS_DIR}:$PATH
 
 mkdir -p $REPOS_DIR