diff --git a/Makefile b/Makefile
index e83b2e6244b65..bd242d019ef08 100644
--- a/Makefile
+++ b/Makefile
@@ -72,8 +72,12 @@ CGOFLAG_TSH = $(CGOFLAG)
 endif
 endif
 
-OS ?= $(shell go env GOOS)
-ARCH ?= $(shell go env GOARCH)
+GO_ENV_OS := $(shell go env GOOS)
+OS ?= $(GO_ENV_OS)
+
+GO_ENV_ARCH := $(shell go env GOARCH)
+ARCH ?= $(GO_ENV_ARCH)
+
 FIPS ?=
 RELEASE = teleport-$(GITTAG)-$(OS)-$(ARCH)-bin