diff --git a/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf b/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf
index 48c93955218f733397dc4247b0015c87bcc412d5..77be1ac4dfa02457e61559799da1076d98cc185f 100644
--- a/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf
+++ b/meta-cassini-bsp/meta-arm/meta-arm-bsp/recipes-core/systemd/corstone1000/system.conf
@@ -6,3 +6,5 @@
 [Manager]
 # Change DefaultTimeoutStartSec from 90s to 300s
 DefaultTimeoutStartSec = 300s
+# Change DefaultDeviceTimeoutSec from 90s to 300s
+DefaultDeviceTimeoutSec = 300s