diff --git a/SRT/Servers/SRTMinorServo/include/SRTMinorServoParkThread.h b/SRT/Servers/SRTMinorServo/include/SRTMinorServoParkThread.h
index c2af90348243addb93c925268ef4bac9512a9dde..031e058a80dd22ca93a427b2800ac0ad68e5c5d7 100644
--- a/SRT/Servers/SRTMinorServo/include/SRTMinorServoParkThread.h
+++ b/SRT/Servers/SRTMinorServo/include/SRTMinorServoParkThread.h
@@ -11,8 +11,8 @@
 #include <ComponentErrors.h>
 #include "SRTMinorServoBossCore.h"
 
-// TODO: fine-tune this with the real hardware. The correct procedure can easily exceed this timeout, it should be increased accordingly.
-#define PARK_TIMEOUT 60
+// Same timeout as the one defined for the SETUP procedure
+#define PARK_TIMEOUT 120
 
 class SRTMinorServoBossCore;
 
diff --git a/SRT/Servers/SRTMinorServo/include/SRTMinorServoSetupThread.h b/SRT/Servers/SRTMinorServo/include/SRTMinorServoSetupThread.h
index 747c458a41328fc03fe26a53eb691c5343dd140b..2a1f4297ffa8eabec08cdd314a65e103511e4302 100644
--- a/SRT/Servers/SRTMinorServo/include/SRTMinorServoSetupThread.h
+++ b/SRT/Servers/SRTMinorServo/include/SRTMinorServoSetupThread.h
@@ -11,8 +11,8 @@
 #include <ComponentErrors.h>
 #include "SRTMinorServoBossCore.h"
 
-// TODO: fine-tune this with the real hardware. The correct procedure can easily exceed this timeout, it should be increased accordingly.
-#define SETUP_TIMEOUT 60
+// GFR from -160 to 160 takes approximately 110 seconds
+#define SETUP_TIMEOUT 120
 
 class SRTMinorServoBossCore;