diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ce56b94e..209d9218 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -221,7 +221,7 @@ jobs:
 
       - name: Create wheel
         run: |
-          set MAVSDK_SERVER_ARCH=${{ matrix.arch }}
+          $env:MAVSDK_SERVER_ARCH = "${{ matrix.arch }}"
           python3 setup.py bdist_wheel
           Dir "dist/" | rename-item -NewName {$_.name -replace '-any.whl','-${{ matrix.wheel_arch }}.whl'}
 
diff --git a/setup.py b/setup.py
index cb3dfe0d..8b3a2075 100644
--- a/setup.py
+++ b/setup.py
@@ -79,12 +79,14 @@ def platform_suffix(self):
             )
 
         elif platform.system() == "Windows" and "MAVSDK_SERVER_ARCH" in os.environ:
+            # The released Windows assets are named with a .exe suffix, e.g.
+            # mavsdk_server_win_x86.exe -- without it the download 404s.
             if os.environ["MAVSDK_SERVER_ARCH"] == "x86":
-                return "win_x86"
+                return "win_x86.exe"
             elif os.environ["MAVSDK_SERVER_ARCH"] == "x64":
-                return "win_x64"
+                return "win_x64.exe"
             elif os.environ["MAVSDK_SERVER_ARCH"] == "arm64":
-                return "win_arm64"
+                return "win_arm64.exe"
             else:
                 raise NotImplementedError(
                     "Error: unknown MAVSDK_SERVER_ARCH: "