diff --git a/.github/workflows/build-yocto.yml b/.github/workflows/build-yocto.yml
index 68449d9c..ab23297b 100644
--- a/.github/workflows/build-yocto.yml
+++ b/.github/workflows/build-yocto.yml
@@ -94,3 +94,7 @@ jobs:
           (( retries == i )) && { echo 'Failed to publish artifacts'; exit 1; }
 
           echo Image available at: ${url}
+
+      - name: Clear out the generated SBOM files
+        run: |
+          find $TOPDIR -name "*.spdx" -type f -delete
diff --git a/ci/base.yml b/ci/base.yml
index ef632671..afb1249e 100644
--- a/ci/base.yml
+++ b/ci/base.yml
@@ -31,3 +31,8 @@ local_conf_header:
     INHERIT += "rm_work"
 
 machine: unset
+
+post_build_filter:
+  sbom_cleanup: |
+    # Clear out the generated SBOM files
+    find $TOPDIR -name "*.spdx" -type f -delete
diff --git a/ci/yocto-check-layer.sh b/ci/yocto-check-layer.sh
old mode 100755
new mode 100644
index 80a2a6e8..8bad7058
--- a/ci/yocto-check-layer.sh
+++ b/ci/yocto-check-layer.sh
@@ -16,3 +16,6 @@ CMD="$CMD --dependency `pwd`/poky/meta `pwd`/meta-qcom"
 CMD="$CMD --no-auto-dependency"
 
 exec kas shell $TOPDIR/ci/base.yml --command "$CMD"
+
+# Clear out the generated SBOM files
+find $TOPDIR -name "*.spdx" -type f -delete