diff --git a/common.mk b/common.mk
index 3e8e9332b..b12151dcc 100644
--- a/common.mk
+++ b/common.mk
@@ -28,10 +28,10 @@ clean:
 	find . -xtype l -delete
 
 commands: **/**/commands.go
-	go build -ldflags="-s -w" $(GO_ARGS) -o commands src/commands/commands.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o commands src/commands/commands.go
 
 subcommands:
-	go build -ldflags="-s -w" $(GO_ARGS) -o subcommands/subcommands src/subcommands/subcommands.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o subcommands/subcommands src/subcommands/subcommands.go
 	$(MAKE) $(SUBCOMMANDS)
 
 subcommands/%:
@@ -41,7 +41,7 @@ src-clean:
 	rm -rf .gitignore src vendor Makefile *.go glide.* go.sum go.mod
 
 triggers:
-	go build -ldflags="-s -w" $(GO_ARGS) -o triggers src/triggers/triggers.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o triggers src/triggers/triggers.go
 	$(MAKE) $(TRIGGERS)
 
 triggers/%:
diff --git a/plugins/common/Makefile b/plugins/common/Makefile
index c0852a223..7fa54b840 100644
--- a/plugins/common/Makefile
+++ b/plugins/common/Makefile
@@ -1,3 +1,4 @@
+GOARCH ?= amd64
 TRIGGERS = triggers/app-list triggers/core-post-deploy triggers/install triggers/post-delete
 BUILD = prop common triggers
 PLUGIN_NAME = common
@@ -9,9 +10,9 @@ clean-common:
 	rm -rf common
 
 prop: clean-prop **/**/prop.go
-	go build -ldflags="-s -w" $(GO_ARGS) -o prop src/prop/prop.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o prop src/prop/prop.go
 
 common: clean-common **/**/common.go
-	go build -ldflags="-s -w" $(GO_ARGS) -o common src/common/common.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o common src/common/common.go
 
 include ../../common.mk
diff --git a/plugins/config/Makefile b/plugins/config/Makefile
index 6a4bef9ec..e38a8f62d 100644
--- a/plugins/config/Makefile
+++ b/plugins/config/Makefile
@@ -1,3 +1,4 @@
+GOARCH ?= amd64
 SUBCOMMANDS = subcommands/bundle subcommands/clear subcommands/export subcommands/get subcommands/keys subcommands/show subcommands/set subcommands/unset
 TRIGGERS = triggers/config-export triggers/config-get triggers/config-get-global
 BUILD = commands config_sub subcommands triggers
@@ -7,6 +8,6 @@ clean-config_sub:
 	rm -rf config_sub
 
 config_sub: clean-config_sub **/**/config_sub.go
-	go build -ldflags="-s -w" $(GO_ARGS) -o config_sub src/config_sub/config_sub.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o config_sub src/config_sub/config_sub.go
 
 include ../../common.mk
diff --git a/plugins/nginx-vhosts/Makefile b/plugins/nginx-vhosts/Makefile
index bfac40629..c5c13ee82 100644
--- a/plugins/nginx-vhosts/Makefile
+++ b/plugins/nginx-vhosts/Makefile
@@ -1,3 +1,4 @@
+GOARCH ?= amd64
 BUILD = pagesize
 PLUGIN_NAME = nginx-vhosts
 
@@ -5,6 +6,6 @@ clean-pagesize:
 	rm -rf pagesize
 
 pagesize: clean-pagesize **/**/pagesize.go
-	go build -ldflags="-s -w" $(GO_ARGS) -o pagesize src/pagesize/pagesize.go
+	GOARCH=$(GOARCH) go build -ldflags="-s -w" $(GO_ARGS) -o pagesize src/pagesize/pagesize.go
 
 include ../../common.mk