diff --git a/windows/Dockerfile b/windows/Dockerfile
index 3baabd9..c6c1cb2 100644
--- a/windows/Dockerfile
+++ b/windows/Dockerfile
@@ -124,7 +124,7 @@ RUN cmake -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DCMAK
 
 
 # OpenSSL
-#WORKDIR /soft
+WORKDIR /soft
 #RUN wget -v https://github.com/openssl/openssl/releases/download/openssl-${CUR_OPENSSL_VERSION}/openssl-${CUR_OPENSSL_VERSION}.tar.gz \
 # && tar -xf openssl-${CUR_OPENSSL_VERSION}.tar.gz -C /soft \
 # && rm -f openssl-${CUR_OPENSSL_VERSION}.tar.gz \
@@ -176,12 +176,10 @@ RUN wget -v https://mirrors.ustc.edu.cn/qtproject/archive/qt/${CUR_QT_VERSION_MA
 
 # OpenCV
 WORKDIR /soft
-RUN wget -v https://github.com/opencv/opencv/archive/refs/tags/${CUR_OPENCV_VERSION}.tar.gz \
- && tar -xf ${CUR_OPENCV_VERSION}.tar.gz -C /soft \
- && rm -f ${CUR_OPENCV_VERSION}.tar.gz \
+RUN git clone -b ${CUR_OPENCV_VERSION} --depth 1 https://github.com/opencv/opencv.git \
  && mkdir -p ${INSTALL_DIR}/build/opencv && cd ${INSTALL_DIR}/build/opencv \
- && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_LIBJPEG_TURBO_SIMD=0 -DBUILD_PERF_TESTS=0 -DBUILD_TESTS=0 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/opencv-* \
- && make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/opencv-*
+ && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_BUILD_TYPE=Release -DENABLE_LIBJPEG_TURBO_SIMD=0 -DBUILD_PERF_TESTS=0 -DBUILD_TESTS=0 -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} /soft/opencv \
+ && make install -j${JOBS_COUNT} && rm -rf ./* && rm -rf /soft/opencv
 
 
 # HDF5
@@ -194,6 +192,7 @@ RUN git clone -b hdf5_${CUR_HDF5_VERSION} --depth 1 https://github.com/HDFGroup/
 
 
 # curl (should be last)
+WORKDIR /soft
 #RUN git clone -b curl-${CUR_CURL_VERSION} --depth 1 https://github.com/curl/curl \
 # && mkdir curl_build && cd curl_build \
 # && cmake -DCMAKE_INSTALL_PREFIX=${INSTALL_DIR} -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN} -DCMAKE_BUILD_TYPE=Release -DBUILD_STATIC_LIBS=1 -DBUILD_SHARED_LIBS=0 -DBUILD_LIBCURL_DOCS=0 -DBUILD_MISC_DOCS=0 ../curl \