diff --git a/Makefile b/Makefile
index c1583504b58..0b20dbb1465 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 GOPATH ?= $(shell go env GOPATH)
 GOOS ?= $(shell go env GOOS)
-GOARCH ?= amd64
+GOARCH ?= $(shell go env GOARCH)
 BUILD_DIR ?= ./out
 ORG = github.com/GoogleContainerTools
 PROJECT = skaffold