diff --git a/.github/workflows/vcpkg-linux-drivers.yml b/.github/workflows/vcpkg-linux-drivers.yml
index 688514ebd..fb2a6cf46 100644
--- a/.github/workflows/vcpkg-linux-drivers.yml
+++ b/.github/workflows/vcpkg-linux-drivers.yml
@@ -467,10 +467,13 @@ jobs:
     # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
     # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
     - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ env.RUNNER_WORKSPACE }}
+      working-directory: ${{ runner.workspace }}
       run: >-
-        rm --force --recursive ./HelloWorld-builds-cmake/build-TinyDrivers-fetchcontent-gcc-*
-        rm --force --recursive ./HelloWorld-TinyDrivers-FetchContent-Install
+        rm --force --recursive
+        ./HelloWorld-builds-cmake/build-TinyDrivers-fetchcontent-gcc-${{ matrix.build-type.key }}
+
+        rm --force --recursive
+        ./HelloWorld-TinyDrivers-FetchContent-Install/${{ matrix.build-type.name }}
 
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=OFF is correct (I want to use PCH here)
     - name: HelloWorld-TinyDrivers cmake configure (${{ env.HelloWorldFetchContentBuildName }})
diff --git a/.github/workflows/vcpkg-linux.yml b/.github/workflows/vcpkg-linux.yml
index d3e312dd2..d4cc3b160 100644
--- a/.github/workflows/vcpkg-linux.yml
+++ b/.github/workflows/vcpkg-linux.yml
@@ -419,10 +419,13 @@ jobs:
     # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
     # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
     - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ env.RUNNER_WORKSPACE }}
+      working-directory: ${{ runner.workspace }}
       run: >-
-        rm --force --recursive ./HelloWorld-builds-cmake/build-fetchcontent-gcc-*
-        rm --force --recursive ./HelloWorld-FetchContent-Install
+        rm --force --recursive
+        ./HelloWorld-builds-cmake/build-fetchcontent-gcc-${{ matrix.build-type.key }}
+
+        rm --force --recursive
+        ./HelloWorld-FetchContent-Install/${{ matrix.build-type.name }}
 
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=OFF is correct (I want to use PCH here)
     - name: HelloWorld cmake configure (${{ env.HelloWorldFetchContentBuildName }})
diff --git a/.github/workflows/vcpkg-windows-drivers.yml b/.github/workflows/vcpkg-windows-drivers.yml
index 36c8c157b..623545857 100644
--- a/.github/workflows/vcpkg-windows-drivers.yml
+++ b/.github/workflows/vcpkg-windows-drivers.yml
@@ -479,11 +479,17 @@ jobs:
     # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
     # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
     - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ env.RUNNER_WORKSPACE }}
-      run: >-
-        Remove-Item -Force -Recurse -Path
-        ./HelloWorld-builds-cmake/Drivers-fetchcontent-msvc-*,
-        ./HelloWorld-TinyDrivers-FetchContent-Install
+      working-directory: ${{ runner.workspace }}
+      run: |
+        if (Test-Path ./HelloWorld-builds-cmake/Drivers-fetchcontent-msvc-${{ matrix.build-type.key }}) {
+          Remove-Item -Force -Recurse -Path `
+          ./HelloWorld-builds-cmake/Drivers-fetchcontent-msvc-${{ matrix.build-type.key }}
+        }
+
+        if (Test-Path ./HelloWorld-TinyDrivers-FetchContent-Install/${{ matrix.build-type.name }}) {
+          Remove-Item -Force -Recurse -Path `
+          ./HelloWorld-TinyDrivers-FetchContent-Install/${{ matrix.build-type.name }}
+        }
 
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=ON is correct (Windows ccache doesn't work well with PCH)
     - name: HelloWorld-TinyDrivers cmake configure (${{ env.HelloWorldFetchContentBuildName }})
diff --git a/.github/workflows/vcpkg-windows.yml b/.github/workflows/vcpkg-windows.yml
index d44b2d5fc..33eca8669 100644
--- a/.github/workflows/vcpkg-windows.yml
+++ b/.github/workflows/vcpkg-windows.yml
@@ -426,11 +426,17 @@ jobs:
     # Temporary workaround until the FetchContent UPDATE_DISCONNECTED bugs will be fixed
     # See: https://discourse.cmake.org/t/fetchcontent-declare-update-disconnected-and-vcpkg/11312
     - name: HelloWorld remove build and install trees (FetchContent method)
-      working-directory: ${{ env.RUNNER_WORKSPACE }}
-      run: >-
-        Remove-Item -Force -Recurse -Path
-        ./HelloWorld-builds-cmake/build-fetchcontent-msvc-*,
-        ./HelloWorld-FetchContent-Install
+      working-directory: ${{ runner.workspace }}
+      run: |
+        if (Test-Path ./HelloWorld-builds-cmake/build-fetchcontent-msvc-${{ matrix.build-type.key }}) {
+          Remove-Item -Force -Recurse -Path `
+          ./HelloWorld-builds-cmake/build-fetchcontent-msvc-${{ matrix.build-type.key }}
+        }
+
+        if (Test-Path ./HelloWorld-FetchContent-Install/${{ matrix.build-type.name }}) {
+          Remove-Item -Force -Recurse -Path `
+          ./HelloWorld-FetchContent-Install/${{ matrix.build-type.name }}
+        }
 
     # CMAKE_DISABLE_PRECOMPILE_HEADERS=ON is correct (Windows ccache doesn't work well with PCH)
     - name: HelloWorld cmake configure (${{ env.HelloWorldFetchContentBuildName }})