diff --git a/.github/scripts/install-torch-tensorrt-windows.sh b/.github/scripts/install-torch-tensorrt-windows.sh
index b4d15ea45c..671709951d 100644
--- a/.github/scripts/install-torch-tensorrt-windows.sh
+++ b/.github/scripts/install-torch-tensorrt-windows.sh
@@ -1,9 +1,14 @@
 set -eou pipefail
 source "${BUILD_ENV_FILE}"
-# ${CONDA_RUN} ${PIP_INSTALL_TORCH} torchvision
+
+# Install test index version of Torch and Torchvision
 ${CONDA_RUN} pip install torch torchvision --index-url https://download.pytorch.org/whl/test/${CU_VERSION}
 ${CONDA_RUN} pip install pyyaml mpmath==1.3.0
+
+# Install TRT 10 from PyPi
 ${CONDA_RUN} pip install tensorrt==10.0.0b6 tensorrt-${CU_VERSION::4}-bindings==10.0.0b6 tensorrt-${CU_VERSION::4}-libs==10.0.0b6 --extra-index-url https://pypi.nvidia.com
+
+# Install pre-built Torch-TRT
 ${CONDA_RUN} pip install ${RUNNER_ARTIFACT_DIR}/torch_tensorrt*.whl
 
 echo -e "Running test script";
diff --git a/packaging/pre_build_script_windows.sh b/packaging/pre_build_script_windows.sh
index 65e0368dd5..8bcdee5f36 100644
--- a/packaging/pre_build_script_windows.sh
+++ b/packaging/pre_build_script_windows.sh
@@ -1,5 +1,9 @@
 python -m pip install -U numpy packaging pyyaml setuptools wheel
+
+# Install Torch from Test Index
 python -m pip install torch==2.3.0 --index-url https://download.pytorch.org/whl/test/${CU_VERSION}
+
+# Install TRT 10 from PyPi
 python -m pip install tensorrt==10.0.0b6 tensorrt-${CU_VERSION::4}-bindings==10.0.0b6 tensorrt-${CU_VERSION::4}-libs==10.0.0b6 --extra-index-url https://pypi.nvidia.com
 
 choco install bazelisk -y
diff --git a/setup.py b/setup.py
index 3403bf9821..ba29433e5f 100644
--- a/setup.py
+++ b/setup.py
@@ -82,7 +82,8 @@ def load_dep_info():
 
 CXX11_ABI = False
 JETPACK_VERSION = None
-PY_ONLY = sys.platform.startswith("win")
+# TODO: Remove once C++ Runtime is integrated in Windows
+PY_ONLY = IS_WINDOWS
 NO_TS = False
 LEGACY = False
 RELEASE = False