diff --git a/Scripts/Install/InstallWindows.ps1 b/Scripts/Install/InstallWindows.ps1
index 69b0a96..b56a34d 100644
--- a/Scripts/Install/InstallWindows.ps1
+++ b/Scripts/Install/InstallWindows.ps1
@@ -9,7 +9,7 @@ $installBlock =
    iex ( ( New-Object System.Net.WebClient ).DownloadString( 'https://chocolatey.org/install.ps1' ) )
 
    $packageListChocoPath = Join-Path -Path $installToolsPath -ChildPath "PackageListChoco.config"
-   choco install "$packageListChocoPath"
+   choco install --force "$packageListChocoPath"
    refreshenv
 
    $packageListPythonPath = Join-Path -Path $installToolsPath -ChildPath "PackageListPython.txt"
@@ -32,6 +32,7 @@ $upgradeBlock =
    refreshenv
 
    $packageListPythonPath = Join-Path -Path $installToolsPath -ChildPath "PackageListPython.txt"
+   python.exe -m pip install --upgrade pip
    pip3 install -r "$packageListPythonPath" --upgrade
    refreshenv
 
diff --git a/Scripts/Install/PackageListChoco.config b/Scripts/Install/PackageListChoco.config
index 93126df..9336758 100644
--- a/Scripts/Install/PackageListChoco.config
+++ b/Scripts/Install/PackageListChoco.config
@@ -3,6 +3,6 @@
    <package id="git" />
    <package id="python3" />
    <package id="openssl" />
-   <package id="cmake" installArguments="ADD_CMAKE_TO_PATH=System" />
+   <package id="cmake.install" installArguments="ADD_CMAKE_TO_PATH=User" />
 </packages>