diff --git a/subsys/ipc/ipc_service/backends/Kconfig.icbmsg b/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
index e31b5cadd77..3a34c63c06c 100644
--- a/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
+++ b/subsys/ipc/ipc_service/backends/Kconfig.icbmsg
@@ -23,6 +23,14 @@ config IPC_SERVICE_BACKEND_ICBMSG_NUM_EP
 	  backend. The number of endpoints are applied to all the instances,
 	  so this value should be maximum number among all the instances.
 
+config IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE
+	int "Workqueue stack size"
+	default 1024 if NO_OPTIMIZATIONS
+	default 512
+	help
+	  Workqueue stack size for bounding processing
+	  (this configuration is not optimized).
+
 module = IPC_SERVICE_BACKEND_ICBMSG
 module-str = ICMSG backend with separate buffers
 module-help = Sets log level for ICMsg backend with buffers
diff --git a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
index 7e985aa76de..f74aafc8ce2 100644
--- a/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
+++ b/subsys/ipc/ipc_service/backends/ipc_icbmsg.c
@@ -118,7 +118,8 @@ LOG_MODULE_REGISTER(ipc_icbmsg,
 #define FLAG_EPT_COUNT_MASK 0xFFFF
 
 /** Workqueue stack size for bounding processing (this configuration is not optimized). */
-#define EP_BOUND_WORK_Q_STACK_SIZE (512U)
+#define EP_BOUND_WORK_Q_STACK_SIZE \
+	(CONFIG_IPC_SERVICE_BACKEND_ICBMSG_EP_BOUND_WORK_Q_STACK_SIZE)
 
 /** Workqueue priority for bounding processing. */
 #define EP_BOUND_WORK_Q_PRIORITY (CONFIG_SYSTEM_WORKQUEUE_PRIORITY)
diff --git a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay b/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
deleted file mode 100644
index f9615d1b35e..00000000000
--- a/tests/arch/arm/arm_thread_swap/boards/nrf54h20dk_nrf54h20_cpuapp.overlay
+++ /dev/null
@@ -1,9 +0,0 @@
-/* SPDX-License-Identifier: Apache-2.0 */
-
-&cpusec_cpuapp_ipc {
-	status = "disabled";
-};
-
-&cpusec_bellboard {
-	status = "disabled";
-};