diff --git a/utils/podman/Makefile b/utils/podman/Makefile
index bfb0245520381..7f4fafaa4f937 100644
--- a/utils/podman/Makefile
+++ b/utils/podman/Makefile
@@ -81,20 +81,35 @@ else
 endif
 
 MAKE_VARS += \
-	$(GO_PKG_BUILD_CONFIG_VARS) \
-	$(GO_PKG_TARGET_VARS) \
-	$(GP_PKG_BUILD_VARS) \
+	GO_INSTALL_BIN_PATH="$(strip $(GO_PKG_INSTALL_BIN_PATH))" \
+	BUILD_DIR="$(PKG_BUILD_DIR)" \
+	GO_BUILD_DIR="$(GO_PKG_BUILD_DIR)" \
+	GO_BUILD_BIN_DIR="$(GO_PKG_BUILD_BIN_DIR)" \
+	GO_BUILD_DEPENDS_PATH="$(GO_PKG_BUILD_DEPENDS_PATH)" \
+	GO_BUILD_DEPENDS_SRC="$(GO_PKG_BUILD_DEPENDS_SRC)" \
+	GOOS="$(GO_OS)" \
+	GOARCH="$(GO_ARCH)" \
+	CC="$(TARGET_CC)" \
+	CXX="$(TARGET_CXX)" \
+	CGO_CFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CFLAGS))" \
+	CGO_CPPFLAGS="$(TARGET_CPPFLAGS)" \
+	CGO_CXXFLAGS="$(filter-out $(GO_CFLAGS_TO_REMOVE),$(TARGET_CXXFLAGS))" \
+	CGO_LDFLAGS="$(TARGET_LDFLAGS)" \
+	GOPATH="$(GO_PKG_BUILD_DIR)" \
+	GOCACHE="$(GO_BUILD_CACHE_DIR)" \
+	GOMODCACHE="$(GO_MOD_CACHE_DIR)" \
+	GOFLAGS="$(GO_PKG_GCFLAGS)" \
+	GO_PKG_CFLAGS="$(GO_PKG_CFLAGS)" \
+	CGO_ENABLED=1 \
+	GOENV=off \
 	PREFIX=/usr \
 	LIBEXECDIR=/usr/lib \
 	LIBEXECPODMAN=/usr/lib/podman \
 	SHAREDIR_CONTAINERS=/usr/share/containers \
 	ETCDIR=/etc \
 	TMPFILESDIR=/var/run/podman \
-	BUILDTAGS=$(GO_PKG_TAGS) \
-	SELINUXOPT= \
-	GOFLAGS=$(GO_PKG_GCFLAGS) \	
-	EXTRA_LDFLAGS=$(GO_PKG_LDFLAGS) \
-	GO_PKG_CFLAGS=$(GO_PKG_CFLAGS)
+	BUILDTAGS="$(GO_PKG_TAGS)" \
+	EXTRA_LDFLAGS="$(GO_PKG_LDFLAGS)"
 
 define Build/Prepare
 	$(call Build/Prepare/Default)