diff --git a/.github/workflows/4_6_2_Core_Unit_Tests_Win.yaml b/.github/workflows/4_6_2_Core_Unit_Tests_Win.yaml
index 0ac116f31..9e46f0298 100644
--- a/.github/workflows/4_6_2_Core_Unit_Tests_Win.yaml
+++ b/.github/workflows/4_6_2_Core_Unit_Tests_Win.yaml
@@ -64,7 +64,13 @@ jobs:
         dotnet-version: ${{ env.DOTNET_VERSION }}
 
     - name: Setup Step CLI
-      run: powershell -Command "Invoke-WebRequest -Method 'GET' -uri 'https://dl.smallstep.com/gh-release/cli/docs-cli-install/v0.24.4/step_windows_0.24.4_amd64.zip' -Outfile 'C:\temp\step_windows_0.24.4_amd64.zip'" && tar -oxzf C:\temp\step_windows_0.24.4_amd64.zip -C "C:\Program Files" && setx /M PATH "%PATH%;C:\Program Files\step_0.24.4\bin"
+      run: "Invoke-WebRequest -Method 'GET' -uri 'https://dl.smallstep.com/gh-release/cli/docs-cli-install/v0.24.4/step_windows_0.24.4_amd64.zip' -Outfile 'C:\\temp\\step_windows_0.24.4_amd64.zip'; tar -oxzf C:\\temp\\step_windows_0.24.4_amd64.zip -C 'C:\\Program Files';"
+      
+    - name: Add Step CLI to PATH
+      run: echo "C:\Program Files\step_0.24.4\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+
+    - name: Validate Step CLI Install
+      run: dir "C:\Program Files\step_0.24.4" && [Environment]::GetEnvironmentVariable("Path") -split ";" && [Environment]::GetEnvironmentVariable("GITHUB_PATH") -split ";"
 
     - name: Pull step-ca Docker Image
       run: docker pull jrnelson90/step-ca-win
diff --git a/.github/workflows/8_0_Core_Unit_Tests_Win.yaml b/.github/workflows/8_0_Core_Unit_Tests_Win.yaml
index b2a0b30f3..44945da69 100644
--- a/.github/workflows/8_0_Core_Unit_Tests_Win.yaml
+++ b/.github/workflows/8_0_Core_Unit_Tests_Win.yaml
@@ -66,10 +66,10 @@ jobs:
       run: "Invoke-WebRequest -Method 'GET' -uri 'https://dl.smallstep.com/gh-release/cli/docs-cli-install/v0.24.4/step_windows_0.24.4_amd64.zip' -Outfile 'C:\\temp\\step_windows_0.24.4_amd64.zip'; tar -oxzf C:\\temp\\step_windows_0.24.4_amd64.zip -C 'C:\\Program Files';"
       
     - name: Add Step CLI to PATH
-      run: echo "C:\\Program Files\\step_0.24.4\\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+      run: echo "C:\Program Files\step_0.24.4\bin" | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
 
     - name: Validate Step CLI Install
-      run: dir "C:\\Program Files\\step_0.24.4" && [Environment]::GetEnvironmentVariable("Path") -split ";" && [Environment]::GetEnvironmentVariable("GITHUB_PATH") -split ";"
+      run: dir "C:\Program Files\step_0.24.4" && [Environment]::GetEnvironmentVariable("Path") -split ";" && [Environment]::GetEnvironmentVariable("GITHUB_PATH") -split ";"
 
     - name: Pull step-ca Docker Image
       run: docker pull jrnelson90/step-ca-win