diff --git a/Makefile b/Makefile
index 35ce377..34e5f7e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,6 +3,8 @@
 VERSION=$(shell git tag -l --points-at HEAD)
 COMMIT=$(shell git rev-parse HEAD)
 REPO="github.com/dollarshaveclub/psst"
+NATIVE_PLATFORM=`uname -m`
+GOARCH=$(shell [ $(NATIVE_PLATFORM) = 'x86_64'  ] && echo "amd64" || echo $(NATIVE_PLATFORM) )
 
 all: clean bin/psst
 
@@ -10,10 +12,10 @@ install:
 	go install -ldflags "-X $(REPO)/internal/version.CommitSHA=$(COMMIT) -X $(REPO)/internal/version.Version=$(VERSION)" .
 
 build-dsc:
-	GOOS=darwin GOARCH=`uname -m` go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT) -X $(REPO)/cmd.CompiledDirectory=github -X $(REPO)/cmd.CompiledStorage=vault -X $(REPO)/cmd.Org=dollarshaveclub" -o bin/dsc/darwin/psst .
+	GOOS=darwin GOARCH=$(GOARCH) go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT) -X $(REPO)/cmd.CompiledDirectory=github -X $(REPO)/cmd.CompiledStorage=vault -X $(REPO)/cmd.Org=dollarshaveclub" -o bin/dsc/darwin/psst .
 
 build-all:
-	GOOS=darwin GOARCH=`uname -m` go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT)" -o bin/psst-darwin .
+	GOOS=darwin GOARCH=$(GOARCH) go build -ldflags "-X $(REPO)/cmd.Version=$(VERSION) -X $(REPO)/cmd.CommitSHA=$(COMMIT)" -o bin/psst-darwin .
 
 release:
 	cd releaser && go build && ./releaser --commit "$(COMMIT)" --release "${RELEASE}"