diff --git a/docker/x86_64/mingw64 b/docker/x86_64/mingw64
index 7a4230cd..86fa77f1 100644
--- a/docker/x86_64/mingw64
+++ b/docker/x86_64/mingw64
@@ -1175,7 +1175,7 @@ RUN addgroup -g $GID $USERNAME && \
 RUN rsync -av --progress /root/.wine/ /home/$USERNAME/.wine/ && \
   chown -R $UID:$GID -R /home/$USERNAME/.wine/
 
-RUN (mv ${MY_MINGW_DIR}/lib/*.dll ${MY_MINGW_DIR}/bin || echo "no dll's found") \
+RUN (cp ${MY_MINGW_DIR}/lib/*.dll ${MY_MINGW_DIR}/bin || echo "no dll's found") \
     && chmod 0777 -R ${MY_MINGW_DIR} \
     && rm -rf /3rd_party \
     && rm -rf /root/.wine
diff --git a/scripts/env.sh b/scripts/env.sh
index 8923261d..638932df 100755
--- a/scripts/env.sh
+++ b/scripts/env.sh
@@ -47,27 +47,29 @@ done
 
 PROJECT_APP_LIST=()
 PROJECT_CMAKE_OPTS=""
-PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF
 PROJECT_ENABLE_V2_ERRORS=OFF
+PROJECT_ENABLE_WIN32_LONG_PATH_NAMES=OFF
 PROJECT_IS_ALPINE=0
 PROJECT_IS_ARM64=0
+PROJECT_IS_DARWIN=0
 PROJECT_MINGW64_COPY_DEPENDENCIES=()
 PROJECT_MSYS2_PACKAGE_LIST=()
 PROJECT_REQUIRE_ALPINE=OFF
 PROJECT_STATIC_LINK=OFF
-PROJECT_IS_DARWIN=0
 
 if [ "$(uname -s)" == "Darwin" ]; then
   PROJECT_IS_DARWIN=1
-  if [ "$(uname -m)" == "arm64" ]; then
-    PROJECT_IS_ARM64=1
-    PROJECT_BUILD_ARCH="aarch64"
-  fi
 fi
 
 if [ "${PROJECT_BUILD_ARCH}" == "" ]; then
-  PROJECT_BUILD_ARCH=x86_64
-elif [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
+  if [ "$(uname -m)" == "arm64" ]; then
+    PROJECT_BUILD_ARCH=aarch64
+  else
+    PROJECT_BUILD_ARCH=x86_64
+  fi
+fi
+
+if [ "${PROJECT_BUILD_ARCH}" == "aarch64" ]; then
   PROJECT_IS_ARM64=1
 fi