diff --git a/Makefile b/Makefile
index 4e7fe6fc8c4..c85cb165ad2 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 GOOS ?= $(shell go env GOOS)
-GOARCH = amd64
+GOARCH ?= amd64
 BUILD_DIR ?= ./out
 ORG = github.com/GoogleContainerTools
 PROJECT = skaffold
diff --git a/Makefile.diag b/Makefile.diag
index cd772bc52c9..863d6035af2 100644
--- a/Makefile.diag
+++ b/Makefile.diag
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 GOOS ?= $(shell go env GOOS)
-GOARCH = amd64
+GOARCH ?= amd64
 BUILD_DIR ?= ./out
 ORG := github.com/GoogleContainerTools
 PROJECT := diag