diff --git a/.travis.yml b/.travis.yml
index 0ccd17f0..e3b9917b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,18 +49,10 @@ after_success:
   - mv $TRAVIS_BUILD_DIR/Quality/* build
   - mv $TRAVIS_BUILD_DIR/Workaround/* build
   - cd build
-  - zip -o -9 -r -q "../graphicPacks$buildType""_$TRAVIS_BUILD_NUMBER"".zip" ./*
+  - $([ "$buildType" = "Common" ] && echo zip -o -9 -r -q "../graphicPacksCommon_$TRAVIS_BUILD_NUMBER"".zip" ./*  || echo zip -o -9 -r -q "../graphicPacks$TRAVIS_BUILD_NUMBER""_Uncommon.zip" ./*)
   - cd ..
   # Create github release
-  # Remove previous Common asset from release if making the final release with both Common and Uncommon as we need to upload it in a different order to maintain compatibility with existing tools.
-  - |
-    if [ "$buildType" = "Uncommon" ]; then
-    wget "https://github.com/slashiee/cemu_graphic_packs/releases/download/Travis$TRAVIS_BUILD_NUMBER/graphicPacksCommon_$TRAVIS_BUILD_NUMBER.zip";
-    github-release delete --owner=slashiee --repo=cemu_graphic_packs --name="Graphic Packs: version $TRAVIS_BUILD_NUMBER" --tag="Travis$TRAVIS_BUILD_NUMBER" "graphicPacksCommon_$TRAVIS_BUILD_NUMBER"".zip";
-    fi
-  # Upload the release.
-  # The Common build will have the prerelease tag (the Github API skips prereleases if you use the "latest" tag which improves cases where the Common build isn't completed yet).
-  # The Uncommon build will upload both the Common (from the step above) and Uncommon in a specific order. It also removes the prerelease tag.
+  # The odd naming of the releases will create a more compatible order. It's intended.
   - |
     github-release upload \
       --owner=slashiee \
@@ -69,5 +61,4 @@ after_success:
       --name="Graphic Packs: version $TRAVIS_BUILD_NUMBER" \
       --body="$(git log -1 --format='Commited at %ci by **%cn** in commit %h%n### %s%n```%n%b%n```%n') $(if [ '$buildType' = 'Common' ]; then echo 'This is a prerelease with only the common resolutions.'; fi)" \
       $([ "$buildType" = "Common" ] && echo "--prerelease=true" || echo "--prerelease=false") \
-      "graphicPacks$buildType""_$TRAVIS_BUILD_NUMBER"".zip" \
-      $([ "$buildType" = "Uncommon" ] && echo "graphicPacksCommon_$TRAVIS_BUILD_NUMBER"".zip" || echo "")
+      $([ "$buildType" = "Common" ] && echo "graphicPacksCommon_$TRAVIS_BUILD_NUMBER"".zip" || echo "graphicPacks$TRAVIS_BUILD_NUMBER""_Uncommon.zip")