diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8ae073b3..d37ef48a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -20,8 +20,8 @@ jobs:
       - checkout
       - run: chmod u+x install_dependencies.sh && ./install_dependencies.sh clang
       - run: chmod u+x run_tests.sh && ./run_tests.sh clang
-      - store_artifacts:
-          path: ./Release/Linux/erpcgen/erpcgen
+      # - store_artifacts:
+      #     path: ./Release/Linux/erpcgen/erpcgen
   build-mac-gcc:
     macos:
       xcode: 12.5.1 # https://circleci.com/docs/using-macos/#supported-xcode-versions https://en.wikipedia.org/wiki/MacOS_version_history#Releases
@@ -40,8 +40,8 @@ jobs:
       - checkout
       - run: chmod u+x install_dependencies.sh && ./install_dependencies.sh clang
       - run: chmod u+x run_tests.sh && ./run_tests.sh clang
-      - store_artifacts:
-          path: ./Release/Darwin/erpcgen/erpcgen
+      # - store_artifacts:
+      #     path: ./Release/Darwin/erpcgen/erpcgen
   build-windows-mingw:
     executor:
       name: win/default
@@ -50,9 +50,21 @@ jobs:
       - checkout
       - run: powershell.exe .\install_dependencies.ps1
       - run: powershell.exe .\mingw64\bin\mingw32-make erpcgen
+      # - store_artifacts:
+      #     path: ./Release/MINGW64/erpcgen/erpcgen.exe
+  build-windows-VS:
+    executor:
+      name: win/default
+      size: large
+    steps:
+      - checkout
+      - run:
+          name: Install VS buuildtools
+          no_output_timeout: 60m
+          command: powershell.exe .\install_dependencies.ps1 VS
+      - run: powershell.exe  "& 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' .\erpcgen\VisualStudio_v14\erpcgen.sln /property:Configuration=Release"
       - store_artifacts:
-          path: ./Release/MINGW64/erpcgen/erpcgen.exe
-
+          path: ./erpcgen/VisualStudio_v14/Release/erpcgen.exe
 workflows:
   build-workflow:
     jobs:
@@ -61,3 +73,4 @@ workflows:
       - build-mac-gcc
       - build-mac-clang
       - build-windows-mingw
+      - build-windows-VS
diff --git a/.gitignore b/.gitignore
index f0c1fc84..8e4ecc71 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,3 +111,4 @@ boost.7z
 boost*/
 mingw.7z
 mingw64/
+vs_BuildTools*
diff --git a/erpcgen/Makefile b/erpcgen/Makefile
index 470b4fda..a6aa0b7a 100644
--- a/erpcgen/Makefile
+++ b/erpcgen/Makefile
@@ -112,10 +112,6 @@ ifeq "$(build)" "release"
     endif
 endif
 
-ifeq "$(is_mingw)" "1"
-CXXFLAGS += -DBOOST_FILESYSTEM_VERSION=4
-endif
-
 # Run flex
 $(OBJS_ROOT)/erpcgen_lexer.cpp: $(ERPC_ROOT)/erpcgen/src/erpcgen_lexer.l $(OBJS_ROOT)/erpcgen_parser.tab.hpp | $(OBJECTS_DIRS)
 	@$(call printmessage,orange,Generating, $(subst $(ERPC_ROOT)/,,$<))
diff --git a/install_dependencies.ps1 b/install_dependencies.ps1
index 06bc8a2c..22791b98 100644
--- a/install_dependencies.ps1
+++ b/install_dependencies.ps1
@@ -22,8 +22,11 @@ Set-Location "..\..\"
 
 if ($args[0] -eq "VS")
 {
-    # winget install --id=Microsoft.VisualStudio.2019.BuildTools  -e
-    # & 'C:\Program Files (x86)\Microsoft Visual Studio\2019\BuildTools\MSBuild\Current\Bin\MSBuild.exe' .\erpcgen\VisualStudio_v14\erpcgen.sln /property:Configuration=Release
+    $URLBuildtools="https://download.visualstudio.microsoft.com/download/pr/33d686db-3937-4a19-bb3c-be031c5d69bf/66d85abf1020496b07c59aba176def5127352f2fbdd3c4c4143738ab7dfcb459/vs_BuildTools.exe"
+    $PathBuildtools="vs_BuildTools.exe"
+    Remove-Item -ErrorAction Ignore $PathBuildtools
+    Invoke-WebRequest -URI $URLBuildtools -OutFile $PathBuildtools
+    Start-Process $PathBuildtools -ArgumentList "--quiet --add Microsoft.VisualStudio.Workload.VCTools --add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --wait"  -Wait
 }
 else
 {