diff --git a/windows/base/Dockerfile b/windows/base/Dockerfile
index d9588b8dc5e97b45ff9afcf7e7698b7bc0d9dca3..13f8bfcd4ccd8bde4453255af8d1c88d2e756f94 100644
--- a/windows/base/Dockerfile
+++ b/windows/base/Dockerfile
@@ -85,43 +85,3 @@ RUN cd $env:VCPKG_DIR; \
     Remove-Item -Force -Recurse ./downloads; \
     Remove-Item -Force -Recurse ./buildtrees; \
     Remove-Item -Force -Recurse ./packages;
-
-RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
-    Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
-    Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
-    $env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \
-    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
-    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
-    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location \
-        wheel \
-        twine \
-        pytest \
-        pytest-cov \
-        testbook \
-        jupyter \
-        pandas \
-        h5py \
-        ; \
-    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
-    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
-    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
-        wheel \
-        twine \
-        pytest \
-        pytest-cov \
-        testbook \
-        jupyter \
-        pandas \
-        h5py \
-        ; \
-    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
-    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
-    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
-        wheel \
-        twine \
-        pytest \
-        pytest-cov \
-        testbook \
-        jupyter \
-        pandas \
-        h5py
diff --git a/windows/cuda-devel/Dockerfile b/windows/cuda-devel/Dockerfile
index d9bfacd884a7a4776a2f35e513418c45afc37a1b..3f2130a7ab34c55d391d72e899f2eacf813f4d33 100644
--- a/windows/cuda-devel/Dockerfile
+++ b/windows/cuda-devel/Dockerfile
@@ -32,3 +32,43 @@ RUN cd $env:VCPKG_DIR; \
     Remove-Item -Force -Recurse ./downloads; \
     Remove-Item -Force -Recurse ./buildtrees; \
     Remove-Item -Force -Recurse ./packages;
+
+RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
+    Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
+    Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
+    $env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \
+    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location \
+        wheel \
+        twine \
+        pytest \
+        pytest-cov \
+        testbook \
+        jupyter \
+        pandas \
+        h5py \
+        ; \
+    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
+        wheel \
+        twine \
+        pytest \
+        pytest-cov \
+        testbook \
+        jupyter \
+        pandas \
+        h5py \
+        ; \
+    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
+        wheel \
+        twine \
+        pytest \
+        pytest-cov \
+        testbook \
+        jupyter \
+        pandas \
+        h5py
diff --git a/windows/devel/Dockerfile b/windows/devel/Dockerfile
index cc36bff6cddd1404abe46aa76b69e58f757882cb..710a6c1fa76942435e1cadd091a96eed149aba2e 100644
--- a/windows/devel/Dockerfile
+++ b/windows/devel/Dockerfile
@@ -22,10 +22,42 @@ RUN cd $env:VCPKG_DIR; \
     Remove-Item -Force -Recurse ./buildtrees; \
     Remove-Item -Force -Recurse ./packages;
 
-RUN Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
+RUN Must-Run choco install -y --allow-multiple-versions python --version 3.9.1; \
+    Must-Run choco install -y --allow-multiple-versions python --version 3.8.7; \
+    Must-Run choco install -y --allow-multiple-versions python --version 3.7.9; \
+    $env:PATH = "\"$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::User));$([Environment]::GetEnvironmentVariable('PATH', [EnvironmentVariableTarget]::Machine))\""; \
+    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+    Must-Run /Python39/python -m pip --no-cache-dir install --no-warn-script-location \
+        wheel \
+        twine \
         pytest \
-        h5py
-
-RUN Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
+        pytest-cov \
+        testbook \
+        jupyter \
+        pandas \
+        h5py \
+        ; \
+    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+    Must-Run /Python38/python -m pip --no-cache-dir install --no-warn-script-location \
+        wheel \
+        twine \
+        pytest \
+        pytest-cov \
+        testbook \
+        jupyter \
+        pandas \
+        h5py \
+        ; \
+    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location -U pip; \
+    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location 'cryptography<3.4'; \
+    Must-Run /Python37/python -m pip --no-cache-dir install --no-warn-script-location \
+        wheel \
+        twine \
         pytest \
+        pytest-cov \
+        testbook \
+        jupyter \
+        pandas \
         h5py