diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 9abb3117bf..6fdf9cff62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,9 +100,9 @@ jobs:
         run: |
           . scripts/setenv -q
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-            upload-build artifacts/openrct2-portable-*.zip "windows-portable-$PLATFORM" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
-            upload-build artifacts/openrct2-installer-*.exe "windows-installer-$PLATFORM" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
-            upload-build artifacts/openrct2-symbols-*.zip "windows-symbols-$PLATFORM" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-portable-*.zip "windows-portable-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-installer-*.exe "windows-installer-$PLATFORM.exe" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-symbols-*.zip "windows-symbols-$PLATFORM.zip" $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
             upload-backtrace-symbols artifacts/openrct2-symbols-*.zip
           else
               echo 'Not going to push build'
@@ -234,7 +234,7 @@ jobs:
         run: |
           . scripts/setenv
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-            upload-build artifacts/openrct2-macos.zip macos $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-macos.zip macos-universal.zip $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
           else
             echo 'Not going to push build'
           fi
@@ -295,7 +295,7 @@ jobs:
           # Build identification code: https://github.com/Limetric/OpenRCT2.org/blob/e5b738f3dadcc5a3b78e8dfd434756ff31eaa1d3/src/misc/releaseAsset.js#L94-L116
           . scripts/setenv -q
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-            upload-build artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.distro }}-${{ matrix.platform }}.tar.gz linux-${{ matrix.platform }}-${{ matrix.distro }} $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/OpenRCT2-${{ runner.os }}-${{ matrix.distro }}-${{ matrix.platform }}.tar.gz linux-${{ matrix.platform }}-${{ matrix.distro }}.tar.gz $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
           else
             echo 'Not going to push build'
           fi
@@ -328,7 +328,7 @@ jobs:
           # Build identification code: https://github.com/Limetric/OpenRCT2.org/blob/e5b738f3dadcc5a3b78e8dfd434756ff31eaa1d3/src/misc/releaseAsset.js#L94-L116
           . scripts/setenv -q
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-            upload-build artifacts/OpenRCT2-AppImage linux-${{ matrix.platform }}-${{ matrix.distro }} $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/OpenRCT2-AppImage linux.AppImage $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
           else
             echo 'Not going to push build'
           fi
@@ -405,7 +405,7 @@ jobs:
         run: |
           . scripts/setenv -q
           if [[ "$OPENRCT2_PUSH" == "true" ]]; then
-            upload-build artifacts/openrct2-arm.apk android-arm $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
+            upload-build artifacts/openrct2-arm.apk android-arm.apk $OPENRCT2_VERSION $OPENRCT2_SHA1 $OPENRCT2_BRANCH
           else
             echo 'Not going to push build'
           fi
diff --git a/scripts/upload-build b/scripts/upload-build
index 3bfda7edde..3c9f2cfb57 100755
--- a/scripts/upload-build
+++ b/scripts/upload-build
@@ -23,56 +23,6 @@ version=$3
 sha1=$4
 branch=$5
 
-case "$flavour" in
-    windows-portable-win32)
-        flavour=windows-win32.zip
-        flavourid=1
-        ;;
-    windows-portable-x64)
-        flavour=windows-x64.zip
-        flavourid=6
-        ;;
-    windows-installer-win32)
-        flavour=windows-win32.exe
-        flavourid=2
-        ;;
-    windows-installer-x64)
-        flavour=windows-x64.exe
-        flavourid=7
-        ;;
-    windows-symbols-win32)
-        flavour=windows-win32-symbols.zip
-        flavourid=5
-        ;;
-    windows-symbols-x64)
-        flavour=windows-x64-symbols.zip
-        flavourid=10
-        ;;
-    macos)
-        flavour=macos.zip
-        flavourid=3
-        ;;
-    linux-i686)
-        flavour=linux-i686.tar.gz
-        flavourid=4
-        ;;
-    linux-x86_64)
-        flavour=linux-x86_64.tar.gz
-        flavourid=9
-        ;;
-    android-arm)
-        flavour=android-arm.apk
-        flavourid=11
-        ;;
-    android-x86)
-        flavour=android-x86.apk
-        flavourid=12
-        ;;
-    *)
-        echo -e $"\033[0;31mUnknown flavour: $flavour"
-        exit 1
-esac
-
 if [ -n "$branch" ]; then
     versionextra=-$branch-${sha1::7}
 fi