diff --git a/psa_crypto/CMakeLists.txt b/psa_crypto/CMakeLists.txt
index 3e70624..37747f5 100644
--- a/psa_crypto/CMakeLists.txt
+++ b/psa_crypto/CMakeLists.txt
@@ -1,5 +1,5 @@
 #-------------------------------------------------------------------------------
-# Copyright (c) 2020-2023, Arm Limited. All rights reserved.
+# Copyright (c) 2020-2024, Arm Limited. All rights reserved.
 #
 # SPDX-License-Identifier: BSD-3-Clause
 #
@@ -18,7 +18,7 @@
 target_link_libraries(psa_adac_psa_crypto
     PRIVATE
         psa_adac_config
-        tfm_sprt
+        $<$<BOOL:${PSA_ADAC_AS_TFM_RUNTIME_SERVICE}>:$tfm_sprt>
 )
 
 target_link_libraries(trusted-firmware-m-psa-adac
diff --git a/target/trusted-firmware-m/config.cmake b/target/trusted-firmware-m/config.cmake
index 5d6de1b..52de0e9 100644
--- a/target/trusted-firmware-m/config.cmake
+++ b/target/trusted-firmware-m/config.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2021 Arm Limited. All rights reserved.
+# Copyright (c) 2021-2024 Arm Limited. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause
 #
 if (NOT DEFINED TFM_PLATFORM)
@@ -16,3 +16,4 @@
 
 set(PSA_ADAC_QUIET OFF CACHE BOOL "The image will be built to run on QEMU")
 set(PSA_ADAC_DEBUG ON CACHE BOOL "Enable debug")
+set(PSA_ADAC_AS_TFM_RUNTIME_SERVICE OFF CACHE BOOL "Integrate ADAC as TF-M runtime service")
diff --git a/target/trusted-firmware-m/platform/arm/rse/tc/config.cmake b/target/trusted-firmware-m/platform/arm/rse/tc/config.cmake
index 07f15b4..27f64e0 100644
--- a/target/trusted-firmware-m/platform/arm/rse/tc/config.cmake
+++ b/target/trusted-firmware-m/platform/arm/rse/tc/config.cmake
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2022 Arm Limited. All rights reserved.
+# Copyright (c) 2022-2024 Arm Limited. All rights reserved.
 # SPDX-License-Identifier: BSD-3-Clause
 #
 
@@ -10,5 +10,5 @@
 set(PSA_ADAC_EC_P256 OFF CACHE BOOL "Enable support for ECDSA P-256")
 set(PSA_ADAC_EC_P521 ON CACHE BOOL "Enable support for ECDSA P-521")
 set(PSA_ADAC_HW_CRYPTO ON CACHE BOOL "Support for hardware cryptography")
-
+set(PSA_ADAC_AS_TFM_RUNTIME_SERVICE ON CACHE BOOL "Integrate ADAC as TF-M runtime service")
 set(PSA_ADAC_USE_CRYPTOCELL On)