diff --git a/.github/scripts/build-static.sh b/.github/scripts/build-static.sh
index b79c0bb31d..e810514388 100755
--- a/.github/scripts/build-static.sh
+++ b/.github/scripts/build-static.sh
@@ -32,8 +32,10 @@ prepare_assets() {
     cp packaging/version artifacts/latest-version.txt
 
     cd artifacts || exit 1
-    ln -s "${BASENAME}.gz.run" netdata-latest.gz.run
-    sha256sum -b ./* > "sha256sums.txt"
+    ln -s "${BASENAME}.gz.run" "netdata-${BUILDARCH}-latest.gz.run"
+    if [ "${BUILDARCH}" = "x86_64" ]; then
+      ln -s "${BASENAME}.gz.run" netdata-latest.gz.run
+    fi
   ) >&2
 }
 
diff --git a/.github/workflows/release-build.yml b/.github/workflows/release-build.yml
index 9c2af1655d..8cf314eba5 100644
--- a/.github/workflows/release-build.yml
+++ b/.github/workflows/release-build.yml
@@ -130,8 +130,16 @@ jobs:
         uses: actions/checkout@v2
       - name: Prepare Environment
         run: mkdir -p artifacts
-      - name: Retrieve Artifacts
+      - name: Retrieve Dist Tarball
         uses: actions/download-artifact@v2
+        with:
+          name: dist-tarball
+          path: dist-tarball
+      - name: Retrieve Static Build Artifacts
+        uses: actions/download-artifact@v2
+        with:
+          name: static-archive
+          path: static-archive
       - name: Prepare Artifacts
         working-directory: ./artifacts/
         run: |
@@ -241,5 +249,5 @@ jobs:
           ${{
             failure()
             && startsWith(github.ref, 'refs/heads/master')
-            && github.event_name == 'wworkflow_dispatch'
+            && github.event_name == 'workflow_dispatch'
           }}