diff --git a/docker/edk2/Dockerfile b/docker/edk2/Dockerfile
index a32dc779..131fbfb9 100644
--- a/docker/edk2/Dockerfile
+++ b/docker/edk2/Dockerfile
@@ -12,9 +12,13 @@ FROM ${SOURCE_IMAGE} AS base
 ARG TARGETARCH
 
 ARG EDK2_VERSION=edk2-stable202008
+ENV EDK2_VERSION=$EDK2_VERSION
 ARG EDK2_VERSION_COMMIT=06dc822d045c2bb42e497487935485302486e151
+ENV EDK2_VERSION_COMMIT=$EDK2_VERSION_COMMIT
 ARG EDK2_PLATFORM_COMMIT=7093026e924291b9e9f6f5211a052c6a761a4704
+ENV EDK2_PLATFORM_COMMIT=$EDK2_PLATFORM_COMMIT
 ARG EDK2_NON_OSI_COMMIT=4f88718028316aee31cb577f7127d5706255722d
+ENV EDK2_NON_OSI_COMMIT=$EDK2_NON_OSI_COMMIT
 
 ARG GCC_VERSION=9
 ENV GCC_VERSION=$GCC_VERSION
@@ -118,6 +122,8 @@ RUN apt-get update && \
 ARG INTERMEDIATE_IMAGE
 FROM ${INTERMEDIATE_IMAGE} AS toolchain
 
+ARG TARGETARCH
+
 # workaround to get shallow clone of specific commit
 #   https://stackoverflow.com/questions/31278902/how-to-shallow-clone-a-specific-commit-with-depth-1/43136160#43136160
 WORKDIR $TOOLSDIR