diff --git a/deployment_scripts/windows/scripts/prepare_npm.bat b/deployment_scripts/windows/scripts/prepare_npm.bat
index 13f4f57..2fac437 100644
--- a/deployment_scripts/windows/scripts/prepare_npm.bat
+++ b/deployment_scripts/windows/scripts/prepare_npm.bat
@@ -1,5 +1,5 @@
 cd node-bin
-set PATH=%PATH%;%CD%
+set PATH=%PATH%;"%CD%";
 cd ..
 
 npm install
diff --git a/deployment_scripts/windows/scripts/prepare_ollama.bat b/deployment_scripts/windows/scripts/prepare_ollama.bat
index 90cb7ae..773062f 100644
--- a/deployment_scripts/windows/scripts/prepare_ollama.bat
+++ b/deployment_scripts/windows/scripts/prepare_ollama.bat
@@ -1,5 +1,6 @@
 cd ollama-bin
 start /b ollama.exe serve
+timeout 5
 ollama.exe pull phi3.5
 ollama.exe pull qwen2-math:1.5b
 ollama.exe pull starcoder2
diff --git a/deployment_scripts/windows/scripts/prepare_py.bat b/deployment_scripts/windows/scripts/prepare_py.bat
index dc9c8eb..ab23e50 100644
--- a/deployment_scripts/windows/scripts/prepare_py.bat
+++ b/deployment_scripts/windows/scripts/prepare_py.bat
@@ -1,11 +1,12 @@
 cd python-bin
-set PATH=%PATH%;%CD%
+set PATH=%PATH%;"%CD%";
 curl -O https://bootstrap.pypa.io/get-pip.py
-python get-pip.py
+ren python py
+py get-pip.py
 cd Scripts
-set PATH=%PATH%;%CD%
+set PATH=%PATH%;"%CD%";
 cd ..
 cd ..
 
 cd py
-python -m pip install -r requirements.txt
\ No newline at end of file
+py -m pip install -r requirements.txt
\ No newline at end of file
diff --git a/deployment_scripts/windows/scripts/run_electron.bat b/deployment_scripts/windows/scripts/run_electron.bat
index 4b7d254..3a97ac3 100644
--- a/deployment_scripts/windows/scripts/run_electron.bat
+++ b/deployment_scripts/windows/scripts/run_electron.bat
@@ -1,5 +1,5 @@
 cd node-bin
-set PATH=%PATH%;%CD%
+set PATH=%PATH%;"%CD%";
 cd ..
 
 start /b npm start
diff --git a/deployment_scripts/windows/scripts/run_py.bat b/deployment_scripts/windows/scripts/run_py.bat
index d4c9e98..d54c44e 100644
--- a/deployment_scripts/windows/scripts/run_py.bat
+++ b/deployment_scripts/windows/scripts/run_py.bat
@@ -1,7 +1,7 @@
 cd python-bin
-set PATH=%PATH%;%CD%
+set PATH=%PATH%;"%CD%";
 cd Scripts
-set PATH=%PATH%;%CD%
+set PATH=%PATH%;"%CD%";
 cd ..
 cd ..