diff --git a/.github/workflows/debos.yml b/.github/workflows/debos.yml
index ff787b0a..13e968fe 100644
--- a/.github/workflows/debos.yml
+++ b/.github/workflows/debos.yml
@@ -132,18 +132,15 @@ jobs:
           cp -av dtbs.tar.gz "${dir}"
           cp -av disk-ufs.img.gz "${dir}"
           cp -av disk-sdcard.img.gz "${dir}"
-          # TODO: separate flash_* directories between UFS and eMMC
+          # create tarballs with support for all UFS and all eMMC boards
           tar -cvf "${dir}"/flash-ufs.tar.gz \
               disk-ufs.img1 \
               disk-ufs.img2 \
-              flash_qcs615-* \
-              flash_qcs6490-* \
-              flash_qcs8300-* \
-              flash_qcs9100-*
+              $(dirname flash_*/flash-ufs)
           tar -cvf "${dir}"/flash-emmc.tar.gz \
               disk-sdcard.img1 \
               disk-sdcard.img2 \
-              flash_qrb2210-*
+              $(dirname flash_*/flash-emmc)
 
       - name: Upload private artifacts
         uses: qualcomm-linux/upload-private-artifact-action@v1
diff --git a/debos-recipes/qualcomm-linux-debian-rootfs.yaml b/debos-recipes/qualcomm-linux-debian-rootfs.yaml
index 608faccd..ed5f22d3 100644
--- a/debos-recipes/qualcomm-linux-debian-rootfs.yaml
+++ b/debos-recipes/qualcomm-linux-debian-rootfs.yaml
@@ -340,12 +340,12 @@ actions:
       # only in that new kernel, so use the latest dtbs
       latest_kernel="$(
           ls -d "$ROOTDIR"/usr/lib/linux-image-* | sort -V | tail -1)"
-      tar -C "${latest_kernel}" -cvzf "$ARTIFACTDIR/dtbs.tar.gz" \
-          qcom/qcs615-ride.dtb \
-          qcom/qcs6490-rb3gen2.dtb \
-          qcom/qcs8300-ride.dtb \
-          qcom/qcs9100-ride-r3.dtb \
-          qcom/qrb2210-rb1.dtb
+      # transform pathnames to strip the leading ./
+      tar \
+          -C "${latest_kernel}" \
+          --transform='s|^\./||' \
+          -cvzf "$ARTIFACTDIR/dtbs.tar.gz" \
+          .
 
   - action: pack
     description: Create root filesystem tarball