diff --git a/Makefile b/Makefile
index ccbb5b2..70cbf21 100644
--- a/Makefile
+++ b/Makefile
@@ -9,14 +9,15 @@ steps:
 	if [ "$(TARGET_ARCHITECTURE)" = "x86_64" ] || [ "$(TARGET_ARCHITECTURE)" = "" ]; then DOCKER_IMAGE_FILENAME="Dockerfile.x86_64" DOCKER_IMAGE_TAGNAME=$(DOCKER_IMAGE_NAME):$(DOCKER_IMAGE_VERSION)-x86_64 make build; fi
 
 build:
+	$(eval OS := $(shell uname -s))
 	$(eval ARCHITECTURE := $(shell export DOCKER_IMAGE_TAGNAME="$(DOCKER_IMAGE_TAGNAME)"; echo $$DOCKER_IMAGE_TAGNAME | grep -oe -.*))
 
 	docker build --target builder --build-arg COMMIT_HASH=$(N2N_COMMIT_HASH) -t $(DOCKER_IMAGE_TAGNAME) -f image-platforms/$(DOCKER_IMAGE_FILENAME) .
 
 	docker container create --name builder $(DOCKER_IMAGE_TAGNAME)
 	if [ ! -d "./build" ]; then mkdir ./build; fi
-	docker container cp builder:/usr/src/n2n/supernode ./build/supernode$(ARCHITECTURE)
-	docker container cp builder:/usr/src/n2n/edge ./build/edge$(ARCHITECTURE)
+	docker container cp builder:/usr/src/n2n/supernode ./build/supernode-$(OS)$(ARCHITECTURE)
+	docker container cp builder:/usr/src/n2n/edge ./build/edge-$(OS)$(ARCHITECTURE)
 	docker container rm -f builder
 
 	docker build --build-arg COMMIT_HASH=$(N2N_COMMIT_HASH) -t $(DOCKER_IMAGE_TAGNAME) -f image-platforms/$(DOCKER_IMAGE_FILENAME) .