diff --git a/Makefile b/Makefile
index e0d43438..f04a71a6 100644
--- a/Makefile
+++ b/Makefile
@@ -22,16 +22,9 @@ extract_python_package_version := $(shell echo $(project_version) | sed 's/-/./'
 dev_username := developer
 
 
-ifeq ($(PLATFORM),amd64)
-platform := x86_64
-endif
-
-ifeq ($(PLATFORM),arm64)
-platform := aarch64
-endif
-
-platform ?= x86_64
-$(info Platform value is $(platform))
+# Handle multi-platform builds locally (CI sets these env vars, but need defaults here)
+TARGETPLATFORM ?= linux/amd64
+$(info Target platform is $(TARGETPLATFORM))
 
 
 pull: ## Pull all images
@@ -226,7 +219,7 @@ build-packages-cpp-standalone: ## Build C++ packages (standalone)
 	@ echo "Building C++ packages..."
 
 	docker run \
-		--platform ${platform} \
+		--platform $(TARGETPLATFORM) \
 		--rm \
 		--volume="$(CURDIR):/app:delegated" \
 		--volume="/app/build" \
@@ -250,7 +243,7 @@ build-packages-python-standalone: ## Build Python packages (standalone)
 	@ echo "Building Python packages..."
 
 	docker run \
-		--platform ${platform} \
+		--platform $(TARGETPLATFORM) \
 		--rm \
 		--volume="$(CURDIR):/app:delegated" \
 		--volume="/app/build" \