diff --git a/Makefile b/Makefile
index 96fef15..1959fc5 100644
--- a/Makefile
+++ b/Makefile
@@ -22,6 +22,7 @@ BUILD_VERSION := $(shell git describe --always --tags --abbrev=0 --dirty  | sed
 DOCKER_CONTAINER_NAME := $(PROGRAM_NAME)
 DOCKER_IMAGE_NAME := senzing/$(PROGRAM_NAME)
 DOCKER_BUILD_IMAGE_NAME := $(DOCKER_IMAGE_NAME)-build
+DOCKER_SUT_IMAGE_NAME := $(PROGRAM_NAME)_sut
 GIT_REMOTE_URL := $(shell git config --get remote.origin.url)
 GIT_REPOSITORY_NAME := $(shell basename `git rev-parse --show-toplevel`)
 GIT_VERSION := $(shell git describe --always --tags --long --dirty | sed -e 's/\-0//' -e 's/\-g.......//')
diff --git a/makefiles/darwin.mk b/makefiles/darwin.mk
index 3bf0fa9..81249fd 100644
--- a/makefiles/darwin.mk
+++ b/makefiles/darwin.mk
@@ -23,7 +23,7 @@ build-osarch-specific: darwin/amd64
 .PHONY: clean-osarch-specific
 clean-osarch-specific:
 	@docker rm  --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
-	@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true
+	@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) $(DOCKER_SUT_IMAGE_NAME) 2> /dev/null || true
 	@rm -f  $(GOPATH)/bin/$(PROGRAM_NAME) || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/.coverage || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/coverage.html || true
diff --git a/makefiles/darwin_arm64.mk b/makefiles/darwin_arm64.mk
index 6897c45..63685bc 100644
--- a/makefiles/darwin_arm64.mk
+++ b/makefiles/darwin_arm64.mk
@@ -11,7 +11,7 @@ build-osarch-specific: darwin/arm64
 .PHONY: docker-build-osarch-specific
 docker-build-osarch-specific:
 	@docker build \
-		--platform linux/amd64 \
+		--platform linux/arm64 \
 		--tag $(DOCKER_IMAGE_NAME) \
 		--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
 		.
diff --git a/makefiles/linux.mk b/makefiles/linux.mk
index 05d9fc7..ebae853 100644
--- a/makefiles/linux.mk
+++ b/makefiles/linux.mk
@@ -19,7 +19,7 @@ build-osarch-specific: linux/amd64
 .PHONY: clean-osarch-specific
 clean-osarch-specific:
 	@docker rm  --force $(DOCKER_CONTAINER_NAME) 2> /dev/null || true
-	@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) 2> /dev/null || true
+	@docker rmi --force $(DOCKER_IMAGE_NAME) $(DOCKER_BUILD_IMAGE_NAME) $(DOCKER_SUT_IMAGE_NAME) 2> /dev/null || true
 	@rm -f  $(GOPATH)/bin/$(PROGRAM_NAME) || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/.coverage || true
 	@rm -f  $(MAKEFILE_DIRECTORY)/coverage.html || true
diff --git a/makefiles/linux_arm64.mk b/makefiles/linux_arm64.mk
index 5c23d78..c176978 100644
--- a/makefiles/linux_arm64.mk
+++ b/makefiles/linux_arm64.mk
@@ -13,7 +13,7 @@ build-osarch-specific: linux/arm64
 .PHONY: docker-build-osarch-specific
 docker-build-osarch-specific:
 	@docker build \
-		--platform linux/amd64 \
+		--platform linux/arm64 \
 		--tag $(DOCKER_IMAGE_NAME) \
 		--tag $(DOCKER_IMAGE_NAME):$(BUILD_VERSION) \
 		.