diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py
index a9cd7b6..436b2f2 100755
--- a/tools/gen_ort_dockerfile.py
+++ b/tools/gen_ort_dockerfile.py
@@ -278,7 +278,7 @@ def dockerfile_for_linux(output_file):
         )
         cuda_archs = "53;62;72;87"
     else:
-        cuda_archs = "60;61;70;75;80;86;90"
+        cuda_archs = "75;80;86;90"
 
     df += """
 WORKDIR /workspace/onnxruntime
@@ -441,7 +441,9 @@ def dockerfile_for_windows(output_file):
 ARG ONNXRUNTIME_VERSION
 ARG ONNXRUNTIME_REPO
 RUN git clone -b rel-%ONNXRUNTIME_VERSION% --recursive %ONNXRUNTIME_REPO% onnxruntime && \
-    (cd onnxruntime && git submodule update --init --recursive)
+    cd onnxruntime && git submodule update --init --recursive && \
+    git config --global user.email "you@example.com" && git config --global user.name "Your Name" && \
+    git cherry-pick 709368ea1443dc1ff68dece31d692ad065fb94d4
 """
 
     if FLAGS.onnx_tensorrt_tag != "":
@@ -471,7 +473,7 @@ def dockerfile_for_windows(output_file):
 WORKDIR /workspace/onnxruntime
 ARG VS_DEVCMD_BAT="\BuildTools\VC\Auxiliary\Build\vcvars64.bat"
 RUN powershell Set-Content 'build.bat' -value 'call %VS_DEVCMD_BAT%',(Get-Content 'build.bat')
-RUN build.bat --cmake_generator "Visual Studio 17 2022" --config Release --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=60;61;70;75;80;86;90" --skip_submodule_sync --parallel --build_shared_lib --compile_no_warning_as_error --skip_tests --update --build --build_dir /workspace/build {}
+RUN build.bat --cmake_generator "Visual Studio 17 2022" --config Release --cmake_extra_defines "CMAKE_CUDA_ARCHITECTURES=75;80;86;90" --skip_submodule_sync --parallel --build_shared_lib --compile_no_warning_as_error --skip_tests --update --build --build_dir /workspace/build {}
 """.format(
         ep_flags
     )