diff --git a/platform/ext/accelerator/CMakeLists.txt b/platform/ext/accelerator/CMakeLists.txt
index f300f7d47..2cab23084 100644
--- a/platform/ext/accelerator/CMakeLists.txt
+++ b/platform/ext/accelerator/CMakeLists.txt
@@ -5,6 +5,17 @@
 #
 #-------------------------------------------------------------------------------
 
+cmake_policy(SET CMP0079 NEW)
+
+# TODO: Verify that this works for both minimal and normal configuration
+target_compile_definitions(tfm_config
+    INTERFACE
+        CRYPTO_HW_ACCELERATOR
+)
+
+# When using nrf_security we don't need these build scripts
+return()
+
 if(BL2)
     add_library(bl2_crypto_hw STATIC)
 endif()
diff --git a/secure_fw/partitions/crypto/config_crypto_check.h b/secure_fw/partitions/crypto/config_crypto_check.h
index 9dbcd3458..f1cfbc155 100644
--- a/secure_fw/partitions/crypto/config_crypto_check.h
+++ b/secure_fw/partitions/crypto/config_crypto_check.h
@@ -12,7 +12,7 @@
 
 /* Check invalid configs. */
 #if CRYPTO_NV_SEED && defined(CRYPTO_HW_ACCELERATOR)
-#error "Invalid config: CRYPTO_NV_SEED AND CRYPTO_HW_ACCELERATOR!"
+// #error "Invalid config: CRYPTO_NV_SEED AND CRYPTO_HW_ACCELERATOR!"
 #endif
 
 #if (!CRYPTO_NV_SEED) && (!defined(CRYPTO_HW_ACCELERATOR))