diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index c9ced30ef..89355e316 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -43,14 +43,6 @@ jobs:
     steps:
     - uses: actions/checkout@v1
 
-    # Set Path workaround for https://github.com/actions/virtual-environments/issues/263
-    - run: |
-        echo "::add-path::C:\Program Files\Git\mingw64\bin"
-        echo "::add-path::C:\Program Files\Git\usr\bin"
-        echo "::add-path::C:\Program Files\Git\bin"
-      if: matrix.os == 'windows-latest'
-      name: "Temp step to Set Path for Windows"
-
     # Build runner layout
     - name: Build & Layout Release
       run: |
diff --git a/src/dev.cmd b/src/dev.cmd
index 0f8a1b57f..75404c9c5 100644
--- a/src/dev.cmd
+++ b/src/dev.cmd
@@ -1,5 +1,16 @@
 @setlocal
 @echo off
+ rem add expected utils to path
+IF EXIST C:\Program Files\Git\usr\bin (
+  SET PATH=C:\Program Files\Git\usr\bin;%PATH%
+)
+IF EXIST C:\Program Files\Git\mingw64\bin (
+  SET PATH=C:\Program Files\Git\mingw64\bin;%PATH%
+)
+IF EXIST C:\Program Files\Git\bin (
+  SET PATH=C:\Program Files\Git\bin;%PATH%
+)
+
  rem Check if SH_PATH is defined.
 if defined SH_PATH (
   goto run