diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index ba0becb67..81804ffd8 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -34,13 +34,13 @@ on:
 jobs:
   build_cli:
     name: Build CLI
-    runs-on: ${{matrix.os}}
+    runs-on: ${{matrix.os.name}}
     strategy:
       matrix:
-        os: [ubuntu-20.04, windows-2022, macos-12]
+        os: [{ name: ubuntu-20.04, bin-name: linux }, { name: windows-2022, bin-name: windows }, { name: macos-12, bin-name: darwin }]
         arch: [amd64, arm64]
         exclude:
-          - os: windows-2022
+          - os: { name: windows-2022, bin-name: windows }
             arch: 'arm64'
 
     steps:
@@ -64,10 +64,13 @@ jobs:
         env:
           GOARCH: ${{ matrix.arch }}
 
+      - name: Rename CLI binary
+        run: mv ./bin/neo-go* ./bin/neo-go-${{ matrix.os.bin-name }}-${{ matrix.arch }}${{ (matrix.os.bin-name == 'windows' && '.exe') || '' }}
+
       - name: Upload artifact
         uses: actions/upload-artifact@v2
         with:
-          name: neo-go-${{ matrix.os }}-${{ matrix.arch }}
+          name: neo-go-${{ matrix.os.bin-name }}-${{ matrix.arch }}
           path: ./bin/neo-go*
           if-no-files-found: error