diff --git a/bypy/macos.conf b/bypy/macos.conf
index 3542d4cdf9..8498e791f8 100644
--- a/bypy/macos.conf
+++ b/bypy/macos.conf
@@ -1,9 +1,9 @@
-# Requires installation of XCode 15 and Python 3 and
+# Requires installation of XCode 15 and
 # python3 -m pip install certifi html5lib
 
 vm_name 'macos-calibre'
 root '/Users/Shared/calibre-build'
 python '/usr/bin/python3'
-rsync '/opt/homebrew/bin/rsync'
+rsync '/usr/local/bin/rsync'
 deploy_target '11.0'
 universal 'true'
diff --git a/bypy/windows.conf b/bypy/windows.conf
index 1527975d50..2ca18428e2 100644
--- a/bypy/windows.conf
+++ b/bypy/windows.conf
@@ -1,20 +1,16 @@
-# Requires installation of Visual Studio 2019 Community Edition, WiX Toolset, Git, Ruby, NodeJS, Python (2 and 3) and Perl
-# Windows SDK >= 10.0.20348.0 which can be installed by downloading the ISO from
-# https://developer.microsoft.com/en-us/windows/downloads/windows-sdk/ and running
-# ./WinSDKSetup.exe /features "OptionId.UWPCpp" "OptionId.DesktopCPPx64" "OptionId.DesktopCPPx86" "OptionID.DesktopCPPARM" "OptionID.DesktopCPPARM64" /q
-# git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM (with 4 threads) to build Qt WebEngine
+# Requires installation of Visual Studio 2022 Community Edition, .NET SDK, WiX Toolset, Git, Ruby (without devkit), NodeJS, Python and Perl
+# git.exe must be in PATH. Must have ~120GB available disk space and 24GB RAM to build Qt WebEngine
 # Install certifi in python 3 with:
 # py.exe -m pip install certifi
-# Note that python2 is needed to build Qt WebEngine
 # Copy opengl32sw.dll from
 # https://download.qt.io/development_releases/prebuilt/llvmpipe/windows/
-# to C:/mesa/32 and C:/mesa/64
+# to C:/mesa/64
 
 vm_name 'windows-calibre'
 root 'C:/r'
 python 'py.exe'
 python2 'C:/Python27/python.exe'
 perl 'C:/Strawberry/perl/bin/perl.exe'
-ruby 'C:/Ruby30-x64/bin/ruby.exe'
-nodejs 'C:/nodejs/node.exe'
+ruby 'C:/Ruby32-x64/bin/ruby.exe'
+nodejs 'C:/Program Files/nodejs/node.exe'
 mesa 'C:/mesa'
diff --git a/bypy/windows/wix.py b/bypy/windows/wix.py
index 46cb1672ec..2b0a50b7eb 100644
--- a/bypy/windows/wix.py
+++ b/bypy/windows/wix.py
@@ -9,6 +9,7 @@ import shutil
 from bypy.constants import is64bit
 from bypy.utils import run
 
+# TODO: Migrate to Wix 4 see https://wixtoolset.org/docs/fourthree/
 WIXP = r'C:\Program Files (x86)\WiX Toolset v3.14'
 if is64bit:
     UPGRADE_CODE = '5DD881FF-756B-4097-9D82-8C0F11D521EA'