diff --git a/runtime.cmd b/runtime.cmd
index 1aa9c8ee..5bd89be8 100644
--- a/runtime.cmd
+++ b/runtime.cmd
@@ -16,8 +16,8 @@ IF EXIST CONDA GOTO APP
 call update-runtime
 
 :APP
-umamba.exe shell hook -s cmd.exe -p %MAMBA_ROOT_PREFIX% -v
-call %MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat
-call %MAMBA_ROOT_PREFIX%\condabin\micromamba.bat activate windows
+umamba.exe shell hook -s cmd.exe -p "%MAMBA_ROOT_PREFIX%" -v
+call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat"
+call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate windows
 %*
 call micromamba deactivate
diff --git a/update-runtime.cmd b/update-runtime.cmd
index b09568d1..44a82c79 100644
--- a/update-runtime.cmd
+++ b/update-runtime.cmd
@@ -41,8 +41,8 @@ umamba create --no-shortcuts -r conda -n windows -f %CONDA_ENVIRONMENT_FILE% -y
 REM Check if hordelib argument is defined
 
 umamba.exe shell hook -s cmd.exe -p %MAMBA_ROOT_PREFIX% -v
-call %MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat
-call %MAMBA_ROOT_PREFIX%\condabin\micromamba.bat activate windows
+call "%MAMBA_ROOT_PREFIX%\condabin\mamba_hook.bat"
+call "%MAMBA_ROOT_PREFIX%\condabin\micromamba.bat" activate windows
 
 if defined hordelib (
   python -s -m pip uninstall -y hordelib horde_model_reference