diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index fa32658f..d4c2e002 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -15,7 +15,9 @@ jobs:
         SDK_VERSION: 8.0.100-rtm.23551.6
         ASPNETCORE_VERSION: 8.0.0-rtm.23531.12
         ROOTFS_DIR: /crossrootfs/riscv64
-
+      volumes:
+        - ${{ github.workspace }}/output:${{ github.workspace }}/output
+        
     steps:
     - name: Clone repositories
       run: |
@@ -37,7 +39,7 @@ jobs:
         mkdir -p ${OUTPUTDIR}
 
         cd runtime
-        ./build.sh --ci -c Release --cross --arch riscv64 /p:OfficialBuildId=$(version_build_id ${RUNTIME_VERSION})
+        ./build.sh --ci -c Release --cross --arch riscv64
         cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Host.linux-riscv64.*.nupkg ${PACKAGESDIR}
         cp artifacts/packages/Release/Shipping/Microsoft.NETCore.App.Runtime.linux-riscv64.*.nupkg ${PACKAGESDIR}
         mkdir -p ${DOWNLOADDIR}/Runtime/${RUNTIME_VERSION}
@@ -55,7 +57,7 @@ jobs:
     - name: Build SDK
       run: |
         cd sdk
-        ./build.sh --pack --ci -c Release /p:Architecture=riscv64 /p:OfficialBuildId=$(version_build_id ${SDK_VERSION})
+        ./build.sh --pack --ci -c Release /p:Architecture=riscv64
         mkdir -p ${DOWNLOADDIR}/Sdk/${SDK_VERSION}
         cp artifacts/packages/Release/NonShipping/dotnet-toolset-internal-*.zip ${DOWNLOADDIR}/Sdk/${SDK_VERSION}/dotnet-toolset-internal-${SDK_VERSION}.zip
         cp artifacts/packages/Release/Shipping/Microsoft.DotNet.Common.*.nupkg ${PACKAGESDIR}
@@ -87,9 +89,10 @@ jobs:
         sed -i s"|<clear />|<clear />\n<add key='local' value='${PACKAGESDIR}' />|" NuGet.config
         ./build.sh --ci -c Release -a riscv64 /p:HostRid=linux-x64 /p:PublicBaseURL=file://${DOWNLOADDIR}/
         cp artifacts/packages/Release/Shipping/dotnet-sdk-*-linux-riscv64.tar.gz ${OUTPUTDIR}
+        cp artifacts/packages/Release/Shipping/dotnet-sdk-*-linux-riscv64.tar.gz.sha512 ${OUTPUTDIR}
 
     - name: Upload .NET
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v4
       with:
         name: dotnet-sdk-linux-riscv64
-        path: ${OUTPUTDIR}/dotnet-sdk-*-linux-riscv64.tar.gz
+        path: "${{ github.workspace }}/output/dotnet-sdk-*-linux-riscv64.tar.gz*"