diff --git a/build_helper/platform_settings/0001-Musca-B1-Enable-emulated-RAM-FS-for-ITS-PS.patch b/build_helper/platform_settings/0001-Musca-B1-Enable-emulated-RAM-FS-for-ITS-PS.patch
new file mode 100644
index 0000000..d25dd8e
--- /dev/null
+++ b/build_helper/platform_settings/0001-Musca-B1-Enable-emulated-RAM-FS-for-ITS-PS.patch
@@ -0,0 +1,29 @@
+From b217e083ecfd7cc5bbdfa59ef238fc53adae4282 Mon Sep 17 00:00:00 2001
+From: Xinyu Zhang <xinyu.zhang@arm.com>
+Date: Fri, 23 Dec 2022 15:25:03 +0800
+Subject: [PATCH 1/2] Musca B1: Enable emulated RAM FS for ITS & PS
+
+Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
+Change-Id: I48e14a91e9428fd77250d959f306f6ae2113784c
+---
+ platform/ext/target/arm/musca_b1/config_tfm_target.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/platform/ext/target/arm/musca_b1/config_tfm_target.h b/platform/ext/target/arm/musca_b1/config_tfm_target.h
+index f90984a08..69174cef2 100644
+--- a/platform/ext/target/arm/musca_b1/config_tfm_target.h
++++ b/platform/ext/target/arm/musca_b1/config_tfm_target.h
+@@ -12,4 +12,10 @@
+ #undef CRYPTO_NV_SEED
+ #define CRYPTO_NV_SEED                         0
+ 
++#undef ITS_RAM_FS
++#define ITS_RAM_FS                             1
++
++#undef PS_RAM_FS
++#define PS_RAM_FS                              1
++
+ #endif /* __CONFIG_TFM_TARGET_H__ */
+-- 
+2.25.1
+
diff --git a/build_helper/platform_settings/0002-STM32-Enable-emulated-RAM-FS-for-ITS-PS.patch b/build_helper/platform_settings/0002-STM32-Enable-emulated-RAM-FS-for-ITS-PS.patch
new file mode 100644
index 0000000..74d432c
--- /dev/null
+++ b/build_helper/platform_settings/0002-STM32-Enable-emulated-RAM-FS-for-ITS-PS.patch
@@ -0,0 +1,29 @@
+From 010d998a44e77edfc167e1a10518afb554df8384 Mon Sep 17 00:00:00 2001
+From: Xinyu Zhang <xinyu.zhang@arm.com>
+Date: Fri, 23 Dec 2022 17:20:20 +0800
+Subject: [PATCH 2/2] STM32: Enable emulated RAM FS for ITS & PS
+
+Signed-off-by: Xinyu Zhang <xinyu.zhang@arm.com>
+Change-Id: I25262b1822ff93edb0b54445c6610ee491084294
+---
+ platform/ext/target/stm/stm32l562e_dk/config_tfm_target.h | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/platform/ext/target/stm/stm32l562e_dk/config_tfm_target.h b/platform/ext/target/stm/stm32l562e_dk/config_tfm_target.h
+index f90984a08..69174cef2 100644
+--- a/platform/ext/target/stm/stm32l562e_dk/config_tfm_target.h
++++ b/platform/ext/target/stm/stm32l562e_dk/config_tfm_target.h
+@@ -12,4 +12,10 @@
+ #undef CRYPTO_NV_SEED
+ #define CRYPTO_NV_SEED                         0
+ 
++#undef ITS_RAM_FS
++#define ITS_RAM_FS                             1
++
++#undef PS_RAM_FS
++#define PS_RAM_FS                              1
++
+ #endif /* __CONFIG_TFM_TARGET_H__ */
+-- 
+2.25.1
+
diff --git a/run-build.sh b/run-build.sh
index 0e24813..ecc10ce 100755
--- a/run-build.sh
+++ b/run-build.sh
@@ -57,6 +57,10 @@
 	cd -
 fi
 
+cd trusted-firmware-m
+git apply ../tf-m-ci-scripts/build_helper/platform_settings/*.patch
+cd -
+
 rm -rf trusted-firmware-m/build
 mkdir trusted-firmware-m/build
 cd trusted-firmware-m/build
diff --git a/tfm_ci_pylib/tfm_build_manager.py b/tfm_ci_pylib/tfm_build_manager.py
index d30c285..68c2f16 100644
--- a/tfm_ci_pylib/tfm_build_manager.py
+++ b/tfm_ci_pylib/tfm_build_manager.py
@@ -408,9 +408,7 @@
         if i.test_psa_api == "CRYPTO" and "musca" in i.tfm_platform:
             overwrite_params["test_psa_api"] += " -DCC312_LEGACY_DRIVER_API_ENABLED=OFF"
         if i.tfm_platform == "arm/musca_b1":
-            overwrite_params["test_psa_api"] += " -DITS_RAM_FS=ON -DPS_RAM_FS=ON"
-        if i.tfm_platform == "stm/stm32l562e_dk":
-            overwrite_params["test_psa_api"] += " -DITS_RAM_FS=ON -DPS_RAM_FS=ON"
+            overwrite_params["test_psa_api"] += " -DOTP_NV_COUNTERS_RAM_EMULATION=ON"
         build_cfg["config_template"] %= overwrite_params
         if len(build_cfg["build_cmds"]) > 1:
             overwrite_build_dir = {"_tbm_build_dir_": build_dir}