diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9596d56..b15fe7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -157,7 +157,7 @@ else()
   endif()
 
   set(TRITON_ONNXRUNTIME_DOCKER_IMAGE "tritonserver_onnxruntime")
-  set(TRITON_ONNXRUNTIME_DOCKER_MEMORY "8g")
+  set(TRITON_ONNXRUNTIME_DOCKER_MEMORY "$<IF:$<BOOL:WIN32>,32g,8g>")
   set(TRITON_ONNXRUNTIME_INCLUDE_PATHS "${CMAKE_CURRENT_BINARY_DIR}/onnxruntime/include")
   set(TRITON_ONNXRUNTIME_LIB_PATHS "${CMAKE_CURRENT_BINARY_DIR}/onnxruntime/lib")
   if (WIN32)
diff --git a/tools/gen_ort_dockerfile.py b/tools/gen_ort_dockerfile.py
index 1763945..a9cd7b6 100755
--- a/tools/gen_ort_dockerfile.py
+++ b/tools/gen_ort_dockerfile.py
@@ -383,7 +383,8 @@ def dockerfile_for_linux(output_file):
     # Linking compiled ONNX Runtime libraries to their corresponding versioned libraries
     df += """
 RUN cd /opt/onnxruntime/lib \
-        && ln -s libonnxruntime.so libonnxruntime.so.${ONNXRUNTIME_VERSION}
+        && ln -s libonnxruntime.so libonnxruntime.so.1 \
+        && ln -s libonnxruntime.so.1 libonnxruntime.so.${ONNXRUNTIME_VERSION}
 """
     df += """
 RUN cd /opt/onnxruntime/lib && \