diff --git a/sbom.yml b/sbom.yml
index b37663c1ca..aab8c131e9 100644
--- a/sbom.yml
+++ b/sbom.yml
@@ -1,5 +1,7 @@
 version: 4.1.0
-cpe: cpe:2.3:a:arm:mbed_tls:{}:*:*:*:*:*:*:*
+cpe:
+  - cpe:2.3:a:arm:mbed_tls:{}:*:*:*:*:*:*:*
+  - cpe:2.3:a:trustedfirmware:mbed_tls:{}:*:*:*:*:*:*:*
 supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
 originator: 'Organization: Trusted Firmware <mbed-tls-security@lists.trustedfirmware.org>'
 description: An open source, portable, easy to use, readable and flexible SSL library with additional features and patches from Espressif.
diff --git a/tf-psa-crypto/sbom.yml b/tf-psa-crypto/sbom.yml
index 060715c211..9ba54ca979 100644
--- a/tf-psa-crypto/sbom.yml
+++ b/tf-psa-crypto/sbom.yml
@@ -1,5 +1,7 @@
 version: 1.1.0
-cpe: cpe:2.3:a:arm:tf-psa-crypto:{}:*:*:*:*:*:*:*
+cpe:
+  - cpe:2.3:a:arm:tf-psa-crypto:{}:*:*:*:*:*:*:*
+  - cpe:2.3:a:trustedfirmware:tf-psa-crypto:{}:*:*:*:*:*:*:*
 supplier: 'Organization: Espressif Systems (Shanghai) CO LTD'
 originator: 'Organization: Trusted Firmware <mbed-tls-security@lists.trustedfirmware.org>'
 description: An implementation of the PSA Cryptography API maintained under the Mbed TLS project.