diff --git a/cfg/IriAnaNavModule.cfg b/cfg/IriAnaNavModule.cfg
index 46bfb645490501893143846508b906cece95da45..fadc9cade07fa19b053ffdedb17c144ca57cfeaf 100755
--- a/cfg/IriAnaNavModule.cfg
+++ b/cfg/IriAnaNavModule.cfg
@@ -51,7 +51,7 @@ gen.add("rate_hz",                 double_t,                0,
 move_base_action.add("mb_max_retries",int_t,                0,                     "Maximum number of retries for the action start",    1,   1,    10)
 move_base_action.add("mb_feedback_watchdog_time_s",double_t,0,                     "Maximum time between feedback messages",    600,   0.01,    600)
 move_base_action.add("mb_enable_watchdog",bool_t,           0,                     "Enable action watchdog",         True)
-move_base_action.add("mb_timeout_s",double_t,               0,                     "Maximum time allowed to complete the action",    6000,   0.1,    6000)
+move_base_action.add("mb_timeout_s",double_t,               0,                     "Maximum time allowed to complete the action",    600,   0.1,    900)
 move_base_action.add("mb_enable_timeout",bool_t,            0,                     "Enable action timeout",          True)
 move_base_action.add("mb_frame_id",str_t,                   0,                     "Reference frame of the position goals","/map")
 move_base_action.add("mb_enabled", bool_t,                  0,                     "Enable action execution",        True)
diff --git a/config/nav_module_default.yaml b/config/nav_module_default.yaml
index 5a4732aa7588f2c0a922a29f1f2ed39f015593cb..133cd763f2eaa2333c5e00eb51450179360df63a 100644
--- a/config/nav_module_default.yaml
+++ b/config/nav_module_default.yaml
@@ -3,7 +3,7 @@ rate_hz: 1.0
 mb_max_retries: 1
 mb_feedback_watchdog_time_s: 60.0
 mb_enable_watchdog: True
-mb_timeout_s: 6000.0
+mb_timeout_s: 660.0
 mb_enable_timeout: True
 mb_frame_id: "/ana/base_link"
 mb_enabled: True