diff --git a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
index e77caa53a214de1561b8541e27a02eeff8cd03bf..c824d3c35bf5fa08fd9c1666fe11a7856909a27e 100644
--- a/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
+++ b/conf/machine/include/corstone1000-mps3-cassini-extra-settings.inc
@@ -24,4 +24,4 @@ IMAGE_INSTALL:remove = "k3s-server k3s-integration-tests-ptest"
 KERNEL_CLASSES:remove = "k3s_kernelcfg_check"
 
 # Due to performance limitations, add wait-online helper
-IMAGE_INSTALL:append:cassini-test = "wait-online"
+IMAGE_INSTALL:append:cassini = " wait-online"
diff --git a/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf b/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/timeouts.conf
similarity index 100%
rename from meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf
rename to meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/timeouts.conf
diff --git a/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend b/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend
index 1ca063336c2c481ed16fa0567a56cc4e13744129..28399fb2633e0267b7eade37153f7177b22f3fef 100644
--- a/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend
+++ b/meta-arm/meta-arm-bsp/recipes-core/systemd/systemd-conf_%.bbappend
@@ -6,10 +6,10 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}:"
 
 SRC_URI:append:corstone1000 = " \
-    file://system.conf \
+    file://timeouts.conf \
 "
 
 # nooelint: oelint.func.specific - Common name set in Corstone-1000 definitions
 do_install:append:corstone1000() {
-    install -D -m0644 ${WORKDIR}/system.conf ${D}${systemd_system_unitdir}.conf.d/01-${PN}.conf
+    install -D -m0644 ${WORKDIR}/timeouts.conf ${D}${systemd_system_unitdir}.conf.d/01-${PN}.conf
 }
diff --git a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-its_%.bbappend b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-its_%.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..64215cd535558d89487082dec51ad188d34f6b48
--- /dev/null
+++ b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-its_%.bbappend
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: <text>Copyright 2023 Arm Limited and/or its
+# affiliates <open-source-office@arm.com></text>
+#
+# SPDX-License-Identifier: MIT
+
+# Override configuration to use block storage service
+OECMAKE_SOURCEPATH:n1sdp = "${S}/deployments/internal-trusted-storage/config/shared-flash-${TS_ENV}"
diff --git a/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-storage_%.bbappend b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-storage_%.bbappend
new file mode 100644
index 0000000000000000000000000000000000000000..2d3e9e98347456916688ed45bb42d4742d054e28
--- /dev/null
+++ b/meta-arm/meta-arm-bsp/recipes-security/trusted-services/ts-sp-storage_%.bbappend
@@ -0,0 +1,7 @@
+# SPDX-FileCopyrightText: <text>Copyright 2023 Arm Limited and/or its
+# affiliates <open-source-office@arm.com></text>
+#
+# SPDX-License-Identifier: MIT
+
+# Override configuration to use block storage service
+OECMAKE_SOURCEPATH:n1sdp = "${S}/deployments/protected-storage/config/shared-flash-${TS_ENV}"