diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 946829f..ac0d95f 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -14,6 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       builds: ${{ steps.prepare-builds.outputs.builds }}
+      builds_out: ${{ steps.prepare-builds.outputs.builds_out }}
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -23,6 +24,12 @@ jobs:
         run: |
           pip3 install toml-cli
           builds=($(toml get builds --toml-path ./builds.toml | tr -d "[],'"))
+          builds_out=()
+          for build in ${builds[@]} ; do
+            distro_codename=($(toml get ${build}.distro_codename --toml-path ./builds.toml))
+            bsp_version=($(toml get ${distro_codename}.bsp_version --toml-path ./configs/bsp_sources.toml))
+            builds_out+=("${build}-${bsp_version}")
+          done
           output_string="["
           for build in ${builds[@]}
           do
@@ -30,6 +37,7 @@ jobs:
           done
           output_string="${output_string::-1}""]"
           echo "builds=${output_string}" >> $GITHUB_OUTPUT
+          echo "::set-output name=builds_out::${builds_out}"
 
   # Job2: Actual build job
   build:
@@ -69,11 +77,11 @@ jobs:
           mkdir -p build
           sudo ./build.sh ${{ matrix.builds }}
 
-      - name: Upload ${{ matrix.builds }}
+      - name: Upload ${{ needs.prepare-build.outputs.builds_out }}
         uses: actions/upload-artifact@v3.1.2
         with:
-          path: build/${{ matrix.builds }}.tar.xz
-          name: ${{ matrix.builds }}
+          path: build/${{ needs.prepare-build.outputs.builds_out }}.tar.xz
+          name: ${{ needs.prepare-build.outputs.builds_out }}
           if-no-files-found: error
 
       - name: Upload ${{ matrix.builds }}.log