diff --git a/.github/actions/setup-env/action.yml b/.github/actions/setup-env/action.yml
index d90777acdf..62036f3849 100644
--- a/.github/actions/setup-env/action.yml
+++ b/.github/actions/setup-env/action.yml
@@ -51,7 +51,8 @@ runs:
       shell: bash
 
     - name: "Bootstrap project"
-      if: ${{ runner.os != 'Windows' }}
+      env:
+        RUN_OS_WINBASH_IS_LINUX: 'true'
       run: |
         if [[ ! -z "${{ inputs.bootstrap-packages }}" ]]
         then
@@ -61,12 +62,3 @@ runs:
         fi
       shell: bash
 
-    - name: "Bootstrap project on windows"
-      if: ${{ runner.os == 'Windows' }}
-      run: |
-        if ( "${{ inputs.bootstrap-packages }}" ) {
-          lerna bootstrap --scope '{${{ inputs.bootstrap-packages }},}'
-        } else {
-          lerna bootstrap
-        }
-      shell: powershell
diff --git a/.github/workflows/e2e-win.yml b/.github/workflows/e2e-win.yml
index 12d617de4c..c1fac49dcf 100644
--- a/.github/workflows/e2e-win.yml
+++ b/.github/workflows/e2e-win.yml
@@ -68,11 +68,11 @@ jobs:
         shell: powershell
 
       - name: Kill Quiet
-        run: Stop-Process -Name "Quiet" -Force
+        run: Get-Process -Name "Quiet" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
 
       - name: Kill tor
-        run: Stop-Process -Name "tor" -Force
+        run: Get-Process -Name "tor" -ErrorAction SilentlyContinue | Stop-Process -Force
         shell: powershell
 
       - name: Delay