diff --git a/.github/workflows/_extension_deploy.yml b/.github/workflows/_extension_deploy.yml
index 97a9d02..08b6ba3 100644
--- a/.github/workflows/_extension_deploy.yml
+++ b/.github/workflows/_extension_deploy.yml
@@ -22,7 +22,8 @@ on:
       exclude_archs:
         required: false
         type: string
-        default: "windows_amd64;windows_amd64_rtools"
+        default: "linux_amd64;linux_amd64_gcc4;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;linux_arm64;osx_amd64;windows_amd64_rtools"
+        # default: "windows_amd64;windows_amd64_rtools"
       # Whether to upload this deployment as the latest. This may overwrite a previous deployment.
       deploy_latest:
         required: false
diff --git a/.github/workflows/_extension_distribution.yml b/.github/workflows/_extension_distribution.yml
index dff0bfb..77577e2 100644
--- a/.github/workflows/_extension_distribution.yml
+++ b/.github/workflows/_extension_distribution.yml
@@ -24,8 +24,8 @@ on:
       exclude_archs:
         required: false
         type: string
-        default: "windows_amd64;windows_amd64_rtools"
-        # default: "linux_amd64;linux_amd64_gcc4;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;linux_arm64;osx_amd64;windows_amd64_rtools"
+        default: "linux_amd64;linux_amd64_gcc4;osx_arm64;wasm_mvp;wasm_eh;wasm_threads;linux_arm64;osx_amd64;windows_amd64_rtools"
+        # default: "windows_amd64;windows_amd64_rtools"
       # Postfix added to artifact names. Can be used to guarantee unique names when this workflow is called multiple times
       artifact_postfix:
         required: false
@@ -306,16 +306,12 @@ jobs:
           cp $OVERLAY_TRIPLET_SRC $OVERLAY_TRIPLET_DST
           echo "set(VCPKG_PLATFORM_TOOLSET_VERSION "14.38")" >> $OVERLAY_TRIPLET_DST
 
-      - name: Set linker flags for MSVC
-        run: |
-          echo "EXT_RELEASE_FLAGS=-DCMAKE_EXE_LINKER_FLAGS='/FORCE:MULTIPLE' -DCMAKE_SHARED_LINKER_FLAGS='/FORCE:MULTIPLE'" >> $GITHUB_ENV
-
       - name: Build & test extension
         env:
           VCPKG_OVERLAY_TRIPLETS: "${{ github.workspace }}/overlay_triplets"
           DUCKDB_PLATFORM: ${{ matrix.duckdb_arch }}
         run: |
-          make test_release
+          make EXT_RELEASE_FLAGS="-DCMAKE_EXE_LINKER_FLAGS='/FORCE:MULTIPLE' -DCMAKE_SHARED_LINKER_FLAGS='/FORCE:MULTIPLE'" test_release
 
       - uses: actions/upload-artifact@v2
         with: