diff --git a/makefile b/makefile
index 6148f5e..2dc697f 100644
--- a/makefile
+++ b/makefile
@@ -11,26 +11,20 @@ build_default:
 	go build -tags "sqlite_foreign_keys release" -ldflags="$(GO_LDFLAGS)" -o _output/yarr src/main.go
 
 build_macos:
-	set GOOS=darwin
-	set GOARCH=amd64
 	mkdir -p _output/macos
-	go build -tags "sqlite_foreign_keys release macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr src/main.go
+	GOOS=darwin GOARCH=amd64 go build -tags "sqlite_foreign_keys release macos" -ldflags="$(GO_LDFLAGS)" -o _output/macos/yarr src/main.go
 	cp src/platform/icon.png _output/macos/icon.png
 	go run bin/package_macos.go -outdir _output/macos -version "$(VERSION)"
 
 build_linux:
-	set GOOS=linux
-	set GOARCH=386
 	mkdir -p _output/linux
-	go build -tags "sqlite_foreign_keys release linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr src/main.go
+	GOOS=linux GOARCH=amd64 go build -tags "sqlite_foreign_keys release linux" -ldflags="$(GO_LDFLAGS)" -o _output/linux/yarr src/main.go
 
 build_windows:
-	set GOOS=windows
-	set GOARCH=386
 	mkdir -p _output/windows
 	go run bin/generate_versioninfo.go -version "$(VERSION)" -outfile src/platform/versioninfo.rc
 	windres -i src/platform/versioninfo.rc -O coff -o src/platform/versioninfo.syso
-	go build -tags "sqlite_foreign_keys release windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe src/main.go
+	GOOS=windows GOARCH=amd64 go build -tags "sqlite_foreign_keys release windows" -ldflags="$(GO_LDFLAGS) -H windowsgui" -o _output/windows/yarr.exe src/main.go
 
 serve:
 	go run -tags "sqlite_foreign_keys" src/main.go -db local.db