diff --git a/.github/workflows/cygwin_build.yml b/.github/workflows/cygwin_build.yml
index 0ef4cf467f..0d601df2fa 100644
--- a/.github/workflows/cygwin_build.yml
+++ b/.github/workflows/cygwin_build.yml
@@ -15,8 +15,8 @@ jobs:
           submodules: 'recursive'
       - uses: cygwin/cygwin-install-action@master
         with:
-          packages: install cygwin32-gcc-g++ python37 python37-future python37-lxml python37-pip python37-setuptools python37-wheel git libexpat procps gettext
-      - name: Install cygwin
+          packages: cygwin64 gcc-g++=10.2.0-1 python37 python37-future python37-lxml python37-pip python37-setuptools python37-wheel git procps gettext
+      - name: Prepare Python environment
         env:
           HOME: ${{ runner.workspace }}/ardupilot
         run: |
@@ -33,7 +33,7 @@ jobs:
         id: check_files
         uses: andstor/file-existence-action@v1
         with:
-          files: "artifacts/ArduPlane.elf.exe, artifacts/ArduCopter.elf.exe, artifacts/ArduHeli.elf.exe, artifacts/ArduRover.elf.exe, artifacts/ArduSub.elf.exe"
+          files: "artifacts/*"
           allow_failure: true
 
       - name: Archive build