diff --git a/setup/autobuild/rrg/client/setup.bat b/setup/autobuild/rrg/client/setup.bat
index 2c9aaa30e..28857f4f0 100644
--- a/setup/autobuild/rrg/client/setup.bat
+++ b/setup/autobuild/rrg/client/setup.bat
@@ -1,6 +1,6 @@
 @echo off
-set HOME=%~dp0
-set QT_PLUGIN_PATH=%HOME%\libs\
-set QT_QPA_PLATFORM_PLUGIN_PATH=%QT_PLUGIN_PATH%
-set PATH=%QT_PLUGIN_PATH%;%QT_PLUGIN_PATH%shell\;%PATH%
+set "HOME=%~dp0"
+set "QT_PLUGIN_PATH=%HOME%\libs\"
+set "QT_QPA_PLATFORM_PLUGIN_PATH=%QT_PLUGIN_PATH%"
+set "PATH=%QT_PLUGIN_PATH%;%QT_PLUGIN_PATH%shell\;%PATH%"
 set MSYSTEM=MINGW64
\ No newline at end of file
diff --git a/setup/autobuild/rrg/pm3-flash-all.bat b/setup/autobuild/rrg/pm3-flash-all.bat
index df3360c73..c01342008 100644
--- a/setup/autobuild/rrg/pm3-flash-all.bat
+++ b/setup/autobuild/rrg/pm3-flash-all.bat
@@ -1,5 +1,5 @@
 @echo off
-cd %~dp0client
+cd "%~dp0client"
 call setup.bat
 ::If you want to force the COM port add it to the line, example:
 ::bash pm3-flash-all COM3
diff --git a/setup/autobuild/rrg/pm3-flash-bootrom.bat b/setup/autobuild/rrg/pm3-flash-bootrom.bat
index 2339f53c7..374d117e4 100644
--- a/setup/autobuild/rrg/pm3-flash-bootrom.bat
+++ b/setup/autobuild/rrg/pm3-flash-bootrom.bat
@@ -1,5 +1,5 @@
 @echo off
-cd %~dp0client
+cd "%~dp0client"
 call setup.bat
 ::If you want to force the COM port add it to the line, example:
 ::bash pm3-flash-bootrom COM3
diff --git a/setup/autobuild/rrg/pm3-flash-fullimage.bat b/setup/autobuild/rrg/pm3-flash-fullimage.bat
index 124cab61b..f6189f7c6 100644
--- a/setup/autobuild/rrg/pm3-flash-fullimage.bat
+++ b/setup/autobuild/rrg/pm3-flash-fullimage.bat
@@ -1,5 +1,5 @@
 @echo off
-cd %~dp0client
+cd "%~dp0client"
 call setup.bat
 ::If you want to force the COM port add it to the line, example:
 ::bash pm3-flash-fullimage COM3
diff --git a/setup/autobuild/rrg/pm3.bat b/setup/autobuild/rrg/pm3.bat
index a35eb6661..c2676024b 100644
--- a/setup/autobuild/rrg/pm3.bat
+++ b/setup/autobuild/rrg/pm3.bat
@@ -1,5 +1,5 @@
 @echo off
-cd %~dp0client
+cd "%~dp0client"
 call setup.bat
 ::If you want to force the COM port use the -p parameter, example:
 ::bash pm3 -p COM3
diff --git a/setup/setup.cmd b/setup/setup.cmd
index cc88bab7a..cb0e219bc 100644
--- a/setup/setup.cmd
+++ b/setup/setup.cmd
@@ -1,5 +1,5 @@
 @echo off
-SET PATH=%cd%\msys2\usr\bin;%PATH%
+SET "PATH=%cd%\msys2\usr\bin;%PATH%"
 copy /Y %cd%\setup\*.post %cd%\msys2\etc\post-install\ >NUL
 copy /Y %cd%\setup\*.conf %cd%\msys2\etc\ >NUL