diff --git a/installation_and_upgrade/IBEX_upgrade.py b/installation_and_upgrade/IBEX_upgrade.py
index 74f0183d..ebed0ce8 100644
--- a/installation_and_upgrade/IBEX_upgrade.py
+++ b/installation_and_upgrade/IBEX_upgrade.py
@@ -114,6 +114,13 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
         choices=["x64", "x86"],
         help="Server build architecture.",
     )
+    parser.add_argument(
+        "--server_winbuild",
+        dest="server_winbuild",
+        default="win7",
+        choices=["win7", "win10", "win11"],
+        help="Server winbuild.",
+    )
 
     deployment_types = [
         f"{choice}: {deployment_types}" for choice, (_, deployment_types) in UPGRADE_TYPES.items()
@@ -179,13 +186,19 @@ def _get_latest_existing_dir_path(release_dir: str, component: str) -> str:
     elif args.kits_icp_dir is not None:
         if args.deployment_type == "install_latest_incr":
             epics_build_dir = os.path.join(
-                args.kits_icp_dir, "EPICS", args.server_build_prefix + "_win7_" + args.server_arch
+                args.kits_icp_dir,
+                "EPICS",
+                args.server_build_prefix + "_" + args.server_winbuild + "_" + args.server_arch,
             )
         else:
             epics_build_dir = os.path.join(
                 args.kits_icp_dir,
                 "EPICS",
-                args.server_build_prefix + "_CLEAN_win7_" + args.server_arch,
+                args.server_build_prefix
+                + "_CLEAN_"
+                + args.server_winbuild
+                + "_"
+                + args.server_arch,
             )
 
         try:
diff --git a/installation_and_upgrade/instrument_install_latest_build_only.bat b/installation_and_upgrade/instrument_install_latest_build_only.bat
index 678507f5..a3bb2870 100644
--- a/installation_and_upgrade/instrument_install_latest_build_only.bat
+++ b/installation_and_upgrade/instrument_install_latest_build_only.bat
@@ -5,6 +5,8 @@ REM  normally will use EPICS_win7_x64 or EPICS_CLEAN_win7_x64 depending on incre
 REM  with prefix specified will use {prefix}_win7_x64 and {prefix}_CLEAN_win7_x64 for server install source directory
 REM argument 3 can be x86 or x64, defaults to x64 if not specified.
 REM  this will change e.g. {prefix}_win7_x64  to {prefix}_win7_x86   as server source directory to use
+REM argument 4 can be server winbuild, defaults to win7 if not specified.
+REM  this will change e.g. {prefix}_win7_x64  to {prefix}_win1_x64   as server source directory to use
 
 setlocal EnableDelayedExpansion
 
@@ -34,6 +36,10 @@ set SERVER_ARCH=x64
 if not "%3" == "" set SERVER_ARCH=%3
 @echo Using server arch %SERVER_ARCH%
 
+set SERVER_WINBUILD=win7
+if not "%4" == "" set SERVER_WINBUILD=%4
+@echo Using server winbuild %SERVER_WINBUILD%
+
 set INSTALL_TYPE=install_latest
 if "%1" == "INCR" (
     set INSTALL_TYPE=install_latest_incr
@@ -72,9 +78,9 @@ if "%1" == "RELEASE" (
     REM set INSTALL_TYPE=instrument_install
     REM set INSTALL_TYPE=training_update
     set INSTALL_TYPE=install_latest
-    "%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --release_dir "%RELEASE_SOURCE%" --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE!
+    "%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --release_dir "%RELEASE_SOURCE%" --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE! --server_winbuild %SERVER_WINBUILD%
 ) else (
-    "%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%"  %SERVER_BUILD_PREFIX% --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE!
+    "%LATEST_PYTHON%" -u "%~dp0IBEX_upgrade.py" --kits_icp_dir "%KITS_ICP_PATH%"  %SERVER_BUILD_PREFIX% --server_arch %SERVER_ARCH% --quiet !INSTALL_TYPE! --server_winbuild %SERVER_WINBUILD%
 )
 IF %errorlevel% neq 0 (
     echo Error %errorlevel% returned from IBEX_upgrade script