diff --git a/src/boards/Main/Configs/FMMConfig.h b/src/boards/Main/Configs/FMMConfig.h
index 1774cfdcf2318b0fbb73b716bf54f5f5aa290f11..a6b0d4b99448b191c0e1d764dd1adc754bad41b6 100644
--- a/src/boards/Main/Configs/FMMConfig.h
+++ b/src/boards/Main/Configs/FMMConfig.h
@@ -34,9 +34,9 @@ namespace FlightModeManager
 // Set at 15 minutes
 constexpr unsigned int MISSION_TIMEOUT = 15 * 60 * 1000;
 
-constexpr unsigned int ENGINE_SHUTDOWN_TIMEOUT = 4000;
+constexpr unsigned int ENGINE_SHUTDOWN_TIMEOUT = 6000;
 
-constexpr unsigned int APOGEE_TIMEOUT = 18 * 1000;
+constexpr unsigned int APOGEE_TIMEOUT = 35 * 1000;
 
 constexpr unsigned int CUT_DURATION = 500;  // [ms]
 
diff --git a/src/boards/Main/Configs/MEAConfig.h b/src/boards/Main/Configs/MEAConfig.h
index 42119899940d532e8b42b29e6ecafeeb65f51c21..994d403f110ddcafdd62efdc54205100a477a30f 100644
--- a/src/boards/Main/Configs/MEAConfig.h
+++ b/src/boards/Main/Configs/MEAConfig.h
@@ -47,7 +47,7 @@ constexpr float SHUTDOWN_APOGEE_TARGET      = 800;     // agl [m]
 #ifndef EUROC
 #warning "MISSION NOT DEFINED: Using EUROC"
 #endif
-constexpr unsigned int SHADOW_MODE_TIMEOUT  = 4500;    // [ms]
+constexpr unsigned int SHADOW_MODE_TIMEOUT  = 3000;    // [ms]
 constexpr float DEFAULT_INITIAL_ROCKET_MASS = 33.69f;  // [kg]
 constexpr float SHUTDOWN_APOGEE_TARGET      = 3200;    // agl [m]
 #endif