diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 285f2af6d5626..8c3afd805fe23 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -51,7 +51,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: ubuntu18.04-installable
-          path: ../swift-wasm-5.3-SNAPSHOT-ubuntu18.04.tar.gz
+          path: ../swift-wasm-5.3-SNAPSHOT-ubuntu18.04-x86_64.tar.gz
 #      - name: Pack test results
 #        run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
 #      - name: Upload test results
@@ -97,7 +97,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: ubuntu20.04-installable
-          path: ../swift-wasm-5.3-SNAPSHOT-ubuntu20.04.tar.gz
+          path: ../swift-wasm-5.3-SNAPSHOT-ubuntu20.04-x86_64.tar.gz
 #      - name: Pack test results
 #        run: tar cJf swift-test-results.tar.gz ../build/*/swift-linux-x86_64/swift-test-results
 #      - name: Upload test results
@@ -134,12 +134,7 @@ jobs:
         uses: actions/upload-artifact@v1
         with:
           name: macos-installable
-          path: ../swift-wasm-5.3-SNAPSHOT-osx.tar.gz
-      - name: Upload packaging scripts
-        uses: actions/upload-artifact@v1
-        with:
-          name: packaging-scripts
-          path: utils/webassembly
+          path: ../swift-wasm-5.3-SNAPSHOT-macos-x86_64.tar.gz
       - name: Pack test results
         run: tar cJf swift-test-results.tar.gz ../target-build/*/swift-macosx-x86_64/swift-test-results
       - name: Upload test results
diff --git a/utils/webassembly/build-toolchain.sh b/utils/webassembly/build-toolchain.sh
index b65de970d8256..e7bbe1a404687 100755
--- a/utils/webassembly/build-toolchain.sh
+++ b/utils/webassembly/build-toolchain.sh
@@ -8,16 +8,16 @@ WASI_SDK_PATH=$SOURCE_PATH/wasi-sdk
 
 case $(uname -s) in
   Darwin)
-    OS_SUFFIX=osx
+    OS_SUFFIX=macos-x86_64
     HOST_PRESET=webassembly-host
     TARGET_PRESET=webassembly-macos-target
     HOST_SUFFIX=macosx-x86_64
   ;;
   Linux)
     if [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=18.04" ]; then
-      OS_SUFFIX=ubuntu18.04
+      OS_SUFFIX=ubuntu18.04-x86_64
     elif [ $(grep RELEASE /etc/lsb-release) == "DISTRIB_RELEASE=20.04" ]; then
-      OS_SUFFIX=ubuntu20.04
+      OS_SUFFIX=ubuntu20.04-x86_64
     else
       echo "Unknown Ubuntu version"
       exit 1
diff --git a/utils/webassembly/distribute-latest-toolchain.sh b/utils/webassembly/distribute-latest-toolchain.sh
index 92a08022da105..64acb5d3d3d27 100755
--- a/utils/webassembly/distribute-latest-toolchain.sh
+++ b/utils/webassembly/distribute-latest-toolchain.sh
@@ -104,22 +104,22 @@ unzip ubuntu18.04-installable.zip
 unzip ubuntu20.04-installable.zip
 unzip macos-installable.zip
 
-toolchain_name=$(basename $(tar tfz swift-wasm-$2-SNAPSHOT-ubuntu18.04.tar.gz | head -n1))
+toolchain_name=$(basename $(tar tfz swift-wasm-$2-SNAPSHOT-ubuntu18.04-x86_64.tar.gz | head -n1))
 
 if is_released $toolchain_name; then
   echo "Latest toolchain $toolchain_name has been already released"
   exit 0
 fi
 
-mv swift-wasm-$2-SNAPSHOT-ubuntu18.04.tar.gz "$toolchain_name-ubuntu18.04.tar.gz"
-mv swift-wasm-$2-SNAPSHOT-ubuntu20.04.tar.gz "$toolchain_name-ubuntu20.04.tar.gz"
-mv swift-wasm-$2-SNAPSHOT-osx.tar.gz "$toolchain_name-osx.tar.gz"
+mv swift-wasm-$2-SNAPSHOT-ubuntu18.04-x86_64.tar.gz "$toolchain_name-ubuntu18.04-x86_64.tar.gz"
+mv swift-wasm-$2-SNAPSHOT-ubuntu20.04-x86_64.tar.gz "$toolchain_name-ubuntu20.04-x86_64.tar.gz"
+mv swift-wasm-$2-SNAPSHOT-macos-x86_64.tar.gz "$toolchain_name-macos-x86_64.tar.gz"
 
 create_tag $toolchain_name $head_sha
 release_id=$(create_release $toolchain_name $toolchain_name $head_sha)
 
-upload_tarball $release_id "$toolchain_name-ubuntu18.04.tar.gz"
-upload_tarball $release_id "$toolchain_name-ubuntu20.04.tar.gz"
-upload_tarball $release_id "$toolchain_name-osx.tar.gz"
+upload_tarball $release_id "$toolchain_name-ubuntu18.04-x86_64.tar.gz"
+upload_tarball $release_id "$toolchain_name-ubuntu20.04-x86_64.tar.gz"
+upload_tarball $release_id "$toolchain_name-macos-x86_64.tar.gz"
 
 popd