diff --git a/subsys/bluetooth/crypto/Kconfig b/subsys/bluetooth/crypto/Kconfig
index 5c1c2fb20fd..0856daf9d9a 100644
--- a/subsys/bluetooth/crypto/Kconfig
+++ b/subsys/bluetooth/crypto/Kconfig
@@ -7,6 +7,7 @@ config BT_CRYPTO
 	select MBEDTLS_PSA_CRYPTO_C if !BUILD_WITH_TFM
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
-	select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
+	select PSA_WANT_ALG_ECB_NO_PADDING
+	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables the Bluetooth Cryptographic Toolbox.
diff --git a/subsys/bluetooth/host/Kconfig.gatt b/subsys/bluetooth/host/Kconfig.gatt
index f9b099058cc..a5441ca199e 100644
--- a/subsys/bluetooth/host/Kconfig.gatt
+++ b/subsys/bluetooth/host/Kconfig.gatt
@@ -132,10 +132,9 @@ config BT_GATT_CACHING
 	bool "GATT Caching support"
 	default y
 	depends on BT_GATT_SERVICE_CHANGED
-	depends on PSA_CRYPTO_CLIENT
 	select PSA_WANT_KEY_TYPE_AES
 	select PSA_WANT_ALG_CMAC
-	select MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
+	imply MBEDTLS_AES_ROM_TABLES if MBEDTLS_PSA_CRYPTO_C
 	help
 	  This option enables support for GATT Caching. When enabled the stack
 	  will register Client Supported Features and Database Hash