diff --git a/Makefile b/Makefile
index 7633c2894d..b826c301ae 100644
--- a/Makefile
+++ b/Makefile
@@ -40,13 +40,13 @@ $(shell $(shell pwd)/common/scripts/setup_env.sh)
 
 RUN = ./common/scripts/run.sh
 
-MAKE = $(RUN) make --no-print-directory -e -f Makefile.core.mk
+MAKE_DOCKER = $(RUN) $(MAKE) --no-print-directory -e -f Makefile.core.mk
 
 %:
-	@$(MAKE) $@
+	@$(MAKE_DOCKER) $@
 
 default:
-	@$(MAKE)
+	@$(MAKE_DOCKER)
 
 shell:
 	@$(RUN) /bin/bash
diff --git a/common/.commonfiles.sha b/common/.commonfiles.sha
index 497ff7b324..a216fbdcab 100644
--- a/common/.commonfiles.sha
+++ b/common/.commonfiles.sha
@@ -1 +1 @@
-12367561d40cda9038675d79901118403f25022e
+ac40d17fb808f434b815094db23b67e2a74636b4
diff --git a/common/scripts/setup_env.sh b/common/scripts/setup_env.sh
index b24d7da24e..01f41d6071 100755
--- a/common/scripts/setup_env.sh
+++ b/common/scripts/setup_env.sh
@@ -96,6 +96,9 @@ if [[ -d "${HOME}/.kube" ]]; then
   CONDITIONAL_HOST_MOUNTS+="--mount type=bind,source=${HOME}/.kube,destination=/home/.kube "
 fi
 
+# Avoid recursive calls to make from attempting to start an additional container
+export BUILD_WITH_CONTAINER=0
+
 # For non container build, we need to write env to file
 if [[ "${1}" == "envfile" ]]; then
   echo "TARGET_OUT_LINUX=${TARGET_OUT_LINUX}"
@@ -105,4 +108,5 @@ if [[ "${1}" == "envfile" ]]; then
   echo "TARGET_OS=${TARGET_OS}"
   echo "LOCAL_ARCH=${LOCAL_ARCH}"
   echo "TARGET_ARCH=${TARGET_ARCH}"
+  echo "BUILD_WITH_CONTAINER=0"
 fi