diff --git a/docker/compose.yaml b/docker/compose.yaml
index 66d02279..1be0143c 100644
--- a/docker/compose.yaml
+++ b/docker/compose.yaml
@@ -53,6 +53,7 @@ services:
         - GCC_VERSION=4.8
         - USE_GCC_VERSION=48
         - PYTHON_PACKAGES=python
+        - PYTHON_VERSION=python2
         - GCC_CROSS_COMPILER_PACKAGES_ARM=gcc-aarch64-linux-gnu gcc-arm-linux-gnueabi gcc-i686-linux-gnu
         - GCC_CROSS_COMPILER_PACKAGES_X86=gcc-i686-linux-gnu
       # NonOSI wasn't used in 2017
@@ -67,6 +68,7 @@ services:
         - EDK2_NON_OSI_COMMIT=4f88718028316aee31cb577f7127d5706255722d
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202105:
     build:
       context: edk2
@@ -78,6 +80,7 @@ services:
         - EDK2_NON_OSI_COMMIT=9c509e9b00cc8f68a0c2293436d0572d3e4a40ce
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202111:
     build:
       context: edk2
@@ -89,6 +92,7 @@ services:
         - EDK2_NON_OSI_COMMIT=eef5e03e52f41492ff7af1a7985bc5eda8d7a448
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   # Building UniversalPayload from this point on is likely ???
   edk2-stable202205:
     build:
@@ -102,6 +106,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202208:
     build:
       context: edk2
@@ -114,6 +119,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202211:
     build:
       context: edk2
@@ -138,6 +144,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202305:
     build:
       context: edk2
@@ -150,6 +157,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=9
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   # Since edk2-stable202305 the GCC_VERSION should be more flexible
   # https://github.com/tianocore/edk2/commit/0fc07b1c6a491fa1e81daed6cfc2ec33c8cac973
   edk2-stable202308:
@@ -164,6 +172,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202311:
     build:
       context: edk2
@@ -176,6 +185,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202402:
     build:
       context: edk2
@@ -188,6 +198,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202405:
     build:
       context: edk2
@@ -200,6 +211,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=12
         - PYTHON_PACKAGES=python-is-python3 python2 python3
+        - PYTHON_VERSION=python3
   edk2-stable202408.01:
     build:
       context: edk2
@@ -212,6 +224,7 @@ services:
         - INTERMEDIATE_IMAGE=universalpayload
         - GCC_VERSION=13
         - PYTHON_PACKAGES=python-is-python3 python3
+        - PYTHON_VERSION=python3
   #==================
   # linux
   #==================
diff --git a/docker/edk2/Dockerfile b/docker/edk2/Dockerfile
index 6085b711..80b40e03 100644
--- a/docker/edk2/Dockerfile
+++ b/docker/edk2/Dockerfile
@@ -26,6 +26,7 @@ ARG USE_GCC_VERSION=5
 ENV USE_GCC_VERSION=$USE_GCC_VERSION
 
 ARG PYTHON_PACKAGES=python-is-python3 python2 python3
+ARG PYTHON_VERSION=python3
 ARG GCC_CROSS_COMPILER_PACKAGES_ARM=gcc-${GCC_VERSION}-aarch64-linux-gnu gcc-${GCC_VERSION}-arm-linux-gnueabi
 ARG GCC_CROSS_COMPILER_PACKAGES_X86=gcc-${GCC_VERSION}-i686-linux-gnu
 
@@ -90,7 +91,7 @@ RUN if [ "${TARGETARCH}" = 'amd64' ]; then \
     mkdir -p "${TOOLSDIR}" && \
     update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_VERSION} 100 && \
     update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-${GCC_VERSION} 100 && \
-    update-alternatives --install /usr/local/bin/python python /usr/bin/python3 100 && \
+    update-alternatives --install /usr/local/bin/python python /usr/bin/${PYTHON_VERSION} 100 && \
     wget --quiet -O rustup.sh https://sh.rustup.rs && \
         chmod +x ./rustup.sh && \
         ./rustup.sh -y --profile minimal