diff --git a/Makefile b/Makefile
index 5cadef38e4..e13f523db4 100644
--- a/Makefile
+++ b/Makefile
@@ -54,8 +54,8 @@ MOCKGEN := $(TOOLS_BIN_DIR)/mockgen
 RELEASE_NOTES := $(TOOLS_BIN_DIR)/release-notes
 
 PATH := $(abspath $(TOOLS_BIN_DIR)):$(PATH)
-DOCKER_CLI_EXPERIMENTAL=enabled
-DOCKER_BUILDKIT=1
+export DOCKER_CLI_EXPERIMENTAL=enabled
+export DOCKER_BUILDKIT=1
 
 PODMAN ?= 0
 ifeq ($(PODMAN), 1)
diff --git a/common.mk b/common.mk
index 44211768a7..ec092e7f1a 100644
--- a/common.mk
+++ b/common.mk
@@ -17,7 +17,6 @@ include $(ROOT_DIR_RELATIVE)/versions.mk
 # Ensure Make is run with bash shell as some syntax below is bash-specific
 SHELL:=bash
 .ONESHELL:
-.EXPORT_ALL_VARIABLES:
 .SHELLFLAGS := -eu -o pipefail -c
 .DELETE_ON_ERROR:
 MAKEFLAGS += --no-builtin-rules