diff --git a/service/Makefile b/service/Makefile
index f54ab48e..fa6f1463 100644
--- a/service/Makefile
+++ b/service/Makefile
@@ -14,14 +14,10 @@ prep:
 	go generate ./...
 
 compile-armhf:
-	go env -w GOARCH=arm GOARM=6
-	go build -o OliveTin.armhf
-	go env -u GOARCH GOARM
+	GOOS=linux GOARCH=arm GOARM=6 go build -o OliveTin.armhf
 
 compile-x64-lin:
-	go env -w GOOS=linux
-	go build -o OliveTin
-	go env -u GOOS
+	GOOS=linux GOARCH=amd64 go build -o OliveTin
 
 compile-x64-win: windows-resources
 	GOOS=windows GOARCH=amd64 go build -o OliveTin.exe
diff --git a/service/generate.go b/service/generate.go
index ebf847f4..603a3908 100644
--- a/service/generate.go
+++ b/service/generate.go
@@ -1,3 +1,3 @@
-//go:generate make -wC ../
+//go:generate make -wC ../ proto
 
 package main