diff --git a/build_deploy.sh b/build_deploy.sh
index a3df0b78..1f1f278b 100755
--- a/build_deploy.sh
+++ b/build_deploy.sh
@@ -39,11 +39,4 @@ if [[ "$VALID_TAGS_LENGTH" -eq 0 ]]; then
 fi
 #### End 
 
-docker --config="$DOCKER_CONF" build --platform linux/amd64  --build-arg BASE_IMAGE="$BASE_IMG" --build-arg GOARCH="amd64" -t "${IMAGE}:${IMAGE_TAG}-amd64" --push .
-docker --config="$DOCKER_CONF" build --platform linux/arm64  --build-arg BASE_IMAGE="$BASE_IMG" --build-arg GOARCH="arm64" -t "${IMAGE}:${IMAGE_TAG}-arm64" --push .
-
-docker --config="$DOCKER_CONF" manifest create "${IMAGE}:${IMAGE_TAG}" \
-    "${IMAGE}:${IMAGE_TAG}-amd64" \
-    "${IMAGE}:${IMAGE_TAG}-arm64"
-
-docker --config="$DOCKER_CONF" manifest push "${IMAGE}:${IMAGE_TAG}"
+docker --config="$DOCKER_CONF" buildx build --platform linux/amd64,linux/arm64 --build-arg BASE_IMAGE="$BASE_IMG" -t "${IMAGE}:${IMAGE_TAG}" --push .
diff --git a/pr_check.sh b/pr_check.sh
index e163655c..f91f0cbd 100755
--- a/pr_check.sh
+++ b/pr_check.sh
@@ -14,7 +14,8 @@ docker rm -f $CONTAINER_NAME-run
 # This confused me for a while because pr_check_inner.sh is also copied into the pr check container at build time
 # but the template_check.sh isn't. I couldn't figure out how it was sourcing it
 
-docker build -t $CONTAINER_NAME -f build/Dockerfile.pr .
+docker buildx build --platform linux/amd64,linux/arm64 -t $CONTAINER_NAME -f build/Dockerfile.pr . 
+docker buildx build --load -t $CONTAINER_NAME -f build/Dockerfile.pr .
 
 docker run -i --name $CONTAINER_NAME-run -v $PWD:/workspace:ro $CONTAINER_NAME /workspace/build/pr_check_inner.sh