diff --git a/.github/workflows/build-and-test.yml b/.github/workflows/build-and-test.yml
index 5fde5674a..4b8d6ad69 100644
--- a/.github/workflows/build-and-test.yml
+++ b/.github/workflows/build-and-test.yml
@@ -40,7 +40,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-15]        
+        os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, windows-11-arm, macos-15]        
         python: ["cp313t", "cp312", "cp311", "cp310"] # because of abi3 we don't need to build separate whls for python 3.13, 3.14
     steps:
     - uses: actions/checkout@v6
diff --git a/setup.py b/setup.py
index f48573709..9d886e644 100644
--- a/setup.py
+++ b/setup.py
@@ -186,10 +186,6 @@ def run(self):
                 )
                 if USE_MSVC_STATIC_RUNTIME:
                     cmake_args.append("-DONNX_USE_MSVC_STATIC_RUNTIME=ON")
-                if platform.architecture()[0] == "64bit":
-                    cmake_args.extend(["-A", "x64", "-T", "host=x64"])
-                else:
-                    cmake_args.extend(["-A", "Win32", "-T", "host=x86"])
             if MACOS:
                 # Cross-compile support for macOS - respect ARCHFLAGS if set
                 archs = re.findall(r"-arch (\S+)", os.environ.get("ARCHFLAGS", ""))