diff --git a/src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h b/src/platform/silabs/EFR32/psa_crypto_config.h
similarity index 100%
rename from src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h
rename to src/platform/silabs/EFR32/psa_crypto_config.h
diff --git a/third_party/silabs/efr32_sdk.gni b/third_party/silabs/efr32_sdk.gni
index c6aa9d95a4fdb0..1583b7eee1e248 100644
--- a/third_party/silabs/efr32_sdk.gni
+++ b/third_party/silabs/efr32_sdk.gni
@@ -139,26 +139,28 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/platform/service/token_manager/test/stack/config",
       "${efr32_sdk_root}/platform/service/token_manager/test/stack/include",
       "${efr32_sdk_root}/platform/middleware/glib",
+      "${efr32_sdk_root}/platform/middleware/glib/config",
       "${efr32_sdk_root}/platform/middleware/glib/glib",
       "${efr32_sdk_root}/platform/middleware/glib/dmd",
       "${efr32_sdk_root}/platform/base/hal/plugin/psstore",
       "${efr32_sdk_root}/platform/base/hal/plugin/antenna",
       "${efr32_sdk_root}/protocol/bluetooth/inc/",
       "${efr32_sdk_root}/app/bluetooth/common/in_place_ota_dfu/",
+      "${efr32_sdk_root}/app/bluetooth/common/in_place_ota_dfu/config/",
       "${efr32_sdk_root}/util/plugin/plugin-common/fem-control",
       "${efr32_sdk_root}/util/silicon_labs/silabs_core/graphics",
       "${efr32_sdk_root}/util/silicon_labs/silabs_core/memory_manager",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/include",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/include/psa",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_alt/include",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/inc",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/config/",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/inc",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/inc/public",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/inc",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/",
+      "${efr32_sdk_root}/util/third_party/mbedtls/include",
+      "${efr32_sdk_root}/util/third_party/mbedtls/include/psa",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_alt/include",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/inc",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/config/",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/inc",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/inc/public",
+      "${efr32_sdk_root}/platform/security/sl_component/se_manager/inc",
+      "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/",
       "${efr32_sdk_root}/util/third_party/freertos/cmsis/Include",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/include",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/config",
@@ -172,7 +174,7 @@ template("efr32_sdk") {
     # declared in efr32_mbedtls_config further down this file.
     defines = [
       "MBEDTLS_CONFIG_FILE=\"efr32-chip-mbedtls-config.h\"",
-      "MBEDTLS_PSA_CRYPTO_CONFIG_FILE=\"efr32-mbedtls-psa-crypto-config.h\"",
+      "MBEDTLS_PSA_CRYPTO_CONFIG_FILE=\"psa_crypto_config.h\"",
       "__STARTUP_CLEAR_BSS",
       "HARD_FAULT_LOG_ENABLE",
       "CORTEXM3_EFM32_MICRO",
@@ -401,7 +403,7 @@ template("efr32_sdk") {
     # edited.
     sources = [
       "${chip_root}/src/platform/silabs/EFR32/efr32-chip-mbedtls-config.h",
-      "${chip_root}/src/platform/silabs/EFR32/efr32-mbedtls-psa-crypto-config.h",
+      "${chip_root}/src/platform/silabs/EFR32/psa_crypto_config.h",
     ]
 
     public_deps = [ "${chip_root}/src/crypto:crypto_buildconfig" ]
@@ -443,6 +445,32 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/platform/radio/rail_lib/hal/efr32/hal_efr.c",
       "${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/pa_conversions_efr32.c",
       "${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_pti/sl_rail_util_pti.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/aes_aes.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/crypto_aes.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/crypto_ecp.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/error.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_ccm.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_cmac.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_ecdsa_ecdh.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/mbedtls_sha.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sl_entropy_hardware.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sl_mbedtls.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/sli_psa_crypto.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/version_features.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_crypto.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_radioaes.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/crypto_management.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_aead.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_cipher.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_hash.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_mac.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_crypto_trng_driver.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_driver_common.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_driver_init.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_psa_trng.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_builtin_keys.c",
+      "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_signature.c",
       "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfrco.c",
       "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_nvic.c",
       "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager.c",
@@ -469,109 +497,6 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/protocol/bluetooth/src/sli_bt_advertiser_config.c",
       "${efr32_sdk_root}/protocol/bluetooth/src/sli_bt_connection_config.c",
       "${efr32_sdk_root}/util/silicon_labs/silabs_core/memory_manager/sl_malloc.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/aes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/aesni.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/asn1parse.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/asn1write.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/base64.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/bignum.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/camellia.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ccm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/chacha20.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/chachapoly.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/cipher.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/cipher_wrap.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/cmac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/constant_time.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ctr_drbg.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/debug.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/des.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/dhm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecdh.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecdsa.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecjpake.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecp.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ecp_curves.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/entropy.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/entropy_poll.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/gcm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/hkdf.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/hmac_drbg.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/md.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/md5.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/oid.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pem.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pk.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pk_wrap.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkcs12.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkcs5.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkparse.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/pkwrite.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/platform.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/platform_util.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/poly1305.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_aead.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_cipher.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_client.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_driver_wrappers.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_ecp.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_hash.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_mac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_rsa.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_se.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_slot_management.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_crypto_storage.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/psa_its_file.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ripemd160.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/rsa.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/sha1.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/sha256.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/sha512.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_cache.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_ciphersuites.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_cli.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_cookie.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_msg.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_srv.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_ticket.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_tls.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/ssl_tls13_keys.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/threading.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/timing.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/version.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_create.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_crl.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_crt.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509_csr.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509write_crt.c",
-      "${efr32_sdk_root}/util/third_party/crypto/mbedtls/library/x509write_csr.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/aes_aes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/crypto_aes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/crypto_ecp.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/error.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_ccm.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_cmac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_ecdsa_ecdh.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/mbedtls_sha.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/sl_entropy_hardware.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/sl_mbedtls.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/version_features.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_crypto.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_protocol_crypto_radioaes.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/crypto_management.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sl_psa_its_nvm3.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_aead.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_cipher.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_hash.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_transparent_driver_mac.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_crypto_trng_driver.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_psa_driver_common.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_psa_driver_init.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_psa_trng.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_builtin_keys.c",
-      "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_signature.c",
       "${efr32_sdk_root}/util/third_party/freertos/cmsis/Source/cmsis_os2.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/croutine.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/event_groups.c",
@@ -580,6 +505,86 @@ template("efr32_sdk") {
       "${efr32_sdk_root}/util/third_party/freertos/kernel/stream_buffer.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/tasks.c",
       "${efr32_sdk_root}/util/third_party/freertos/kernel/timers.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/aes.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/aesni.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/asn1parse.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/asn1write.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/base64.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/bignum.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/camellia.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ccm.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/chacha20.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/chachapoly.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/cipher.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/cipher_wrap.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/cmac.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/constant_time.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ctr_drbg.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/debug.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/des.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/dhm.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecdh.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecdsa.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecjpake.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecp.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ecp_curves.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/entropy.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/entropy_poll.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/gcm.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/hkdf.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/hmac_drbg.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/md.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/md5.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/oid.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pem.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pk.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pk_wrap.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkcs12.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkcs5.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkparse.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/pkwrite.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/platform.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/platform_util.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/poly1305.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_aead.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_cipher.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_client.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_driver_wrappers.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_ecp.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_hash.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_mac.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_rsa.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_se.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_slot_management.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_crypto_storage.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/psa_its_file.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ripemd160.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/rsa.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/sha1.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/sha256.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/sha512.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_cache.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_ciphersuites.c",
+
+      # "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_cli.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_cookie.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_msg.c",
+
+      # "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_srv.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_ticket.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_tls.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/ssl_tls13_keys.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/threading.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/timing.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/version.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_create.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_crl.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_crt.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509_csr.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509write_crt.c",
+      "${efr32_sdk_root}/util/third_party/mbedtls/library/x509write_csr.c",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/gatt_db.c",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_bluetooth.c",
       "${sdk_support_root}/matter/efr32/${silabs_family}/${silabs_board}/autogen/sl_board_default_init.c",
@@ -653,13 +658,13 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/hardware/driver/memlcd/src/sl_memlcd.c",
         "${efr32_sdk_root}/hardware/driver/memlcd/src/sl_memlcd_display.c",
         "${efr32_sdk_root}/platform/middleware/glib/dmd/display/dmd_memlcd.c",
+        "${efr32_sdk_root}/platform/middleware/glib/fonts/glib_font_narrow_6x8.c",
+        "${efr32_sdk_root}/platform/middleware/glib/fonts/glib_font_normal_8x8.c",
+        "${efr32_sdk_root}/platform/middleware/glib/fonts/glib_font_number_16x20.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/bmp.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_bitmap.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_circle.c",
-        "${efr32_sdk_root}/platform/middleware/glib/glib/glib_font_narrow_6x8.c",
-        "${efr32_sdk_root}/platform/middleware/glib/glib/glib_font_normal_8x8.c",
-        "${efr32_sdk_root}/platform/middleware/glib/glib/glib_font_number_16x20.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_line.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_polygon.c",
         "${efr32_sdk_root}/platform/middleware/glib/glib/glib_rectangle.c",
@@ -692,37 +697,37 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG21/Source/startup_efr32mg21.c",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG21/Source/system_efr32mg21.c",
         "${efr32_sdk_root}/platform/radio/rail_lib/plugin/rail_util_rf_path/sl_rail_util_rf_path.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_entropy.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_handling.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_signature.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_util.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_alt/source/sl_se_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_aes.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_gcm.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_jpake.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfrco.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
         "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_entropy.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_handling.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_signature.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_util.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_alt/source/sl_se_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_aes.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_gcm.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_jpake.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
       ]
@@ -731,38 +736,38 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Source/startup_efr32mg24.c",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/EFR32MG24/Source/system_efr32mg24.c",
         "${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/pa_curves_efr32.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_attestation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_entropy.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_handling.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_signature.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_util.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_aes.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_jpake.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dcdc_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
         "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
         "${efr32_sdk_root}/protocol/bluetooth/src/sl_apploader_util_s2.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_attestation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_entropy.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_handling.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_signature.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_util.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_aes.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_jpake.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
       ]
@@ -771,38 +776,38 @@ template("efr32_sdk") {
         "${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/startup_mgm24.c",
         "${efr32_sdk_root}/platform/Device/SiliconLabs/MGM24/Source/system_mgm24.c",
         "${efr32_sdk_root}/platform/radio/rail_lib/plugin/pa-conversions/pa_curves_efr32.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_attestation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_entropy.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_key_handling.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_signature.c",
+        "${efr32_sdk_root}/platform/security/sl_component/se_manager/src/sl_se_manager_util.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_aes.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_mbedtls_support/src/se_jpake.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
+        "${efr32_sdk_root}/platform/security/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_dcdc_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_emu_s2.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_hfxo_mgm24.c",
         "${efr32_sdk_root}/platform/service/device_init/src/sl_device_init_lfxo_s2.c",
         "${efr32_sdk_root}/platform/service/hfxo_manager/src/sl_hfxo_manager_hal_s2.c",
         "${efr32_sdk_root}/protocol/bluetooth/src/sl_apploader_util_s2.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_attestation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_entropy.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_key_handling.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_signature.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/se_manager/src/sl_se_manager_util.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_aes.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_mbedtls_support/src/se_jpake.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_protocol_crypto/src/sli_radioaes_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_key_management.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_opaque_key_derivation.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_aead.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_cipher.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_hash.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_driver_mac.c",
-        "${efr32_sdk_root}/util/third_party/crypto/sl_component/sl_psa_driver/src/sli_se_transparent_key_derivation.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/port.c",
         "${efr32_sdk_root}/util/third_party/freertos/kernel/portable/GCC/ARM_CM33_NTZ/non_secure/portasm.c",
       ]
diff --git a/third_party/silabs/gecko_sdk b/third_party/silabs/gecko_sdk
index 799200bb678893..d4854d2ff06a82 160000
--- a/third_party/silabs/gecko_sdk
+++ b/third_party/silabs/gecko_sdk
@@ -1 +1 @@
-Subproject commit 799200bb6788939aa0fef97d7fc4ee9aca57148d
+Subproject commit d4854d2ff06a828161d7032efb1736d0deda40b1
diff --git a/third_party/silabs/matter_support b/third_party/silabs/matter_support
index da8827efde529d..cfc9d78c7565c8 160000
--- a/third_party/silabs/matter_support
+++ b/third_party/silabs/matter_support
@@ -1 +1 @@
-Subproject commit da8827efde529d79e6d7f29277721ba460efbca7
+Subproject commit cfc9d78c7565c867948435c823b07aefc5835a81