diff --git a/.github/workflows/build_all_targets.yml b/.github/workflows/build_all_targets.yml
index fc33094fd963..675318bee907 100644
--- a/.github/workflows/build_all_targets.yml
+++ b/.github/workflows/build_all_targets.yml
@@ -113,7 +113,6 @@ jobs:
             ccache -s
             ccache -z
 
-
       - name: Missing dependencies for ${{ matrix.arch }}
         if: contains(fromJSON('["aarch64", "armhf"]'), matrix.arch)
         run: |
@@ -125,9 +124,6 @@ jobs:
         run: |
             ./Tools/ci/build_all_runner.sh ${{matrix.targets}} ${{matrix.arch}}
 
-      - name: Debug PATHS
-        uses: mxschmitt/action-tmate@v3
-
       - name: Arrange Build Artifacts
         run: |
           ./Tools/ci/package_build_artifacts.sh
diff --git a/Tools/ci/package_build_artifacts.sh b/Tools/ci/package_build_artifacts.sh
index 63666705e73b..2b487f7632e3 100755
--- a/Tools/ci/package_build_artifacts.sh
+++ b/Tools/ci/package_build_artifacts.sh
@@ -4,9 +4,9 @@ mkdir artifacts
 cp **/**/*.px4 artifacts/
 cp **/**/*.elf artifacts/
 for build_dir_path in build/*/ ; do
-  build_dir_path=${build_dir_path#*/}
-  build_dir=$build_dir_path
-  build_dir=${build_dir::${#build_dir}-1}
+  build_dir_path=${build_dir_path::${#build_dir_path}-1}
+  build_dir=${build_dir_path#*/}
+  target_name=$build_dir
   mkdir artifacts/$build_dir
   find artifacts/ -maxdepth 1 -type f -name "*$build_dir*"
   # Airframe