diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml
index d57d24c6..e2e53fd0 100644
--- a/.github/workflows/build_cmake.yml
+++ b/.github/workflows/build_cmake.yml
@@ -51,10 +51,10 @@ jobs:
             os: windows-latest,
             cc: "cl", cxx: "cl",
             build_type: "Release",
-            cmake_flags: "-DOPENSSL_ROOT_DIR=D:\\a\\Tools\\OpenSSL\\Win_x64",
+            cmake_flags: "",
             build_flags: "-j 2",
             cpack_flags: "-G NSIS",
-            ssl_env: "D:\\a\\Tools\\OpenSSL\\Win_x64",
+            ssl_env: "D:\\a\\avogadroapp\\Qt\\Tools\\OpenSSLv3\\Win_x64",
           }
         - {
             name: "Ubuntu Address Sanitizer", artifact: "",
@@ -160,16 +160,16 @@ jobs:
         CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake $GITHUB_WORKSPACE ${{env.FEATURES}} -DCMAKE_BUILD_TYPE=${{matrix.config.build_type}} ${{matrix.config.cmake_flags}}
       shell: bash
 
-    - name: Setup tmate session
-      if: runner.os == 'Windows'
-      uses: mxschmitt/action-tmate@v3
-
     - name: Build
       run: |
         CC=${{matrix.config.cc}} CXX=${{matrix.config.cxx}} cmake --build . --config ${{matrix.config.build_type}} ${{matrix.config.build_flags}}
       shell: bash
       working-directory: ${{ runner.workspace }}/build
 
+    - name: Setup tmate session
+      if: failure()
+      uses: mxschmitt/action-tmate@v3
+
     - name: Fix Mac plugins
       if: runner.os == 'macOS'
       working-directory: ${{ runner.workspace }}/build/prefix/lib/openbabel
diff --git a/cmake/AvogadroCPack.cmake b/cmake/AvogadroCPack.cmake
index 725b6070..c8ac781b 100644
--- a/cmake/AvogadroCPack.cmake
+++ b/cmake/AvogadroCPack.cmake
@@ -53,9 +53,9 @@ if(INSTALL_BUNDLE_FILES)
 
   # grab OpenSSL for Windows
   if(WIN32)
-    if(EXISTS "D:/a/Tools/OpenSSL/Win_x64")
+    if(EXISTS "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64/")
       message(STATUS "Using OpenSSL from $ENV{OPENSSL_ROOT_DIR}")
-      set(OPENSSL_ROOT_DIR "D:/a/Tools/OpenSSL/Win_x64")
+      set(OPENSSL_ROOT_DIR "D:/a/avogadroapp/Qt/Tools/OpenSSLv3/Win_x64")
       file(GLOB OPENSSL_DLL $ENV{OPENSSL_ROOT_DIR}/bin/*.dll)
       install(FILES ${OPENSSL_DLL} DESTINATION ${INSTALL_RUNTIME_DIR})
     endif()