diff --git a/Makefile b/Makefile
index 280b6ca92..4e884b97d 100644
--- a/Makefile
+++ b/Makefile
@@ -332,11 +332,14 @@ DEV_DOCKER_GOARCH ?= amd64
 docker-build-dev: export GOOS=$(DEV_DOCKER_GOOS)
 docker-build-dev: export GOARCH=$(DEV_DOCKER_GOARCH)
 docker-build-dev: build
-	docker build \
+	docker buildx build \
+		--load \
+		--platform $(DEV_DOCKER_GOOS)/$(DEV_DOCKER_GOARCH) \
 		--tag $(IMAGE_TAG_DEV) \
 		--target=dev \
 		--build-arg=boundary \
 		.
+	@echo "Successfully built $(IMAGE_TAG_DEV)"
 
 .NOTPARALLEL:
 
diff --git a/testing/dbtest/docker/Makefile b/testing/dbtest/docker/Makefile
index c93c2e7d0..2c7d84378 100644
--- a/testing/dbtest/docker/Makefile
+++ b/testing/dbtest/docker/Makefile
@@ -15,8 +15,6 @@ dockerfiles = $(wildcard Dockerfile.*)
 docker-buildxs = $(patsubst Dockerfile.%,%-buildx, $(dockerfiles))
 docker-load-buildxs = $(patsubst Dockerfile.%,%-load-buildx, $(dockerfiles))
 
-# Before running this target a builder instance needs to be setup, ie:
-#  docker buildx create --driver docker-container --use
 docker-build: ${docker-buildxs}
 
 ${docker-buildxs}: %-buildx: