diff --git a/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
index f56dfa7..ee6d121 100644
--- a/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/mesh/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
@@ -1,4 +1,2 @@
-# The option adds TinyCrypt based bt_rand.
-CONFIG_BT_HOST_CRYPTO=n
-# The option adds GATT caching feature that is based on TinyCrypt.
-CONFIG_BT_GATT_CACHING=n
+# Enable PSA as a crypto backend in host
+CONFIG_BT_USE_PSA_API=y
diff --git a/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
index f56dfa7..ee6d121 100644
--- a/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/mesh_demo/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
@@ -1,4 +1,2 @@
-# The option adds TinyCrypt based bt_rand.
-CONFIG_BT_HOST_CRYPTO=n
-# The option adds GATT caching feature that is based on TinyCrypt.
-CONFIG_BT_GATT_CACHING=n
+# Enable PSA as a crypto backend in host
+CONFIG_BT_USE_PSA_API=y
diff --git a/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf b/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
index c4aa66d..ee6d121 100644
--- a/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
+++ b/samples/bluetooth/mesh_provisioner/boards/nrf5340dk_nrf5340_cpuapp_ns.conf
@@ -1,2 +1,2 @@
-# The option adds TinyCrypt based bt_rand.
-CONFIG_BT_HOST_CRYPTO=n
+# Enable PSA as a crypto backend in host
+CONFIG_BT_USE_PSA_API=y
diff --git a/subsys/bluetooth/mesh/CMakeLists.txt b/subsys/bluetooth/mesh/CMakeLists.txt
index c628fb6..2009601 100644
--- a/subsys/bluetooth/mesh/CMakeLists.txt
+++ b/subsys/bluetooth/mesh/CMakeLists.txt
@@ -127,8 +127,6 @@
 
 zephyr_library_link_libraries_ifdef(CONFIG_MBEDTLS mbedTLS)
 
-if (CONFIG_BUILD_WITH_TFM)
-  target_include_directories(${ZEPHYR_CURRENT_LIBRARY} PRIVATE
-    $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
-  )
-endif()
+zephyr_library_include_directories_ifdef(CONFIG_BUILD_WITH_TFM
+  $<TARGET_PROPERTY:tfm,TFM_BINARY_DIR>/api_ns/interface/include
+)
diff --git a/tests/bsim/bluetooth/mesh/overlay_psa.conf b/tests/bsim/bluetooth/mesh/overlay_psa.conf
index 1957085..764d8cb 100644
--- a/tests/bsim/bluetooth/mesh/overlay_psa.conf
+++ b/tests/bsim/bluetooth/mesh/overlay_psa.conf
@@ -1,7 +1,5 @@
-# The option adds TinyCrypt based bt_rand.
-CONFIG_BT_HOST_CRYPTO=n
-# The option adds GATT caching feature that is based on TinyCrypt.
-CONFIG_BT_GATT_CACHING=n
+# Enable PSA as a crypto backend in host
+CONFIG_BT_USE_PSA_API=y
 
 # Enable mbedTLS PSA as a crypto backend
 CONFIG_BT_MESH_USES_MBEDTLS_PSA=y