diff --git a/src/config/config.h b/src/config/config.h
index 6c71bfb..87a71bf 100644
--- a/src/config/config.h
+++ b/src/config/config.h
@@ -17,6 +17,8 @@ static constexpr U_deg idlerSlotPositions[toolCount + 1] = {
     0.0_deg
 };
 
+static constexpr U_deg_s idlerFeedrate = 1000._deg_s;
+
 // Selector's setup
 
 /// slots 0-4 are the real ones, the 5th is the farthest parking positions
@@ -29,6 +31,8 @@ static constexpr U_mm selectorSlotPositions[toolCount + 1] = {
     20.0_mm + 5 * 14.0_mm
 };
 
+static constexpr U_mm_s selectorFeedrate = 1000._mm_s;
+
 // Printer's filament sensor setup
 static constexpr const uint16_t fsensorDebounceMs = 10;
 
diff --git a/src/modules/idler.cpp b/src/modules/idler.cpp
index 0f61eff..fe789d8 100644
--- a/src/modules/idler.cpp
+++ b/src/modules/idler.cpp
@@ -10,7 +10,7 @@ namespace idler {
 Idler idler;
 
 void Idler::PrepareMoveToPlannedSlot() {
-    mm::motion.PlanMoveTo<mm::Idler>(SlotPosition(plannedSlot), 1000._I_deg_s); // @@TODO
+    mm::motion.PlanMoveTo<mm::Idler>(SlotPosition(plannedSlot), mm::unitToAxisUnit<mm::I_speed_t>(config::idlerFeedrate));
 }
 
 Idler::OperationResult Idler::Disengage() {
diff --git a/src/modules/selector.cpp b/src/modules/selector.cpp
index dee7a86..44bd8c7 100644
--- a/src/modules/selector.cpp
+++ b/src/modules/selector.cpp
@@ -10,7 +10,7 @@ namespace selector {
 Selector selector;
 
 void Selector::PrepareMoveToPlannedSlot() {
-    mm::motion.PlanMoveTo<mm::Selector>(SlotPosition(plannedSlot), 1000.0_S_mm_s); // @@TODO
+    mm::motion.PlanMoveTo<mm::Selector>(SlotPosition(plannedSlot), mm::unitToAxisUnit<mm::S_speed_t>(config::selectorFeedrate));
 }
 
 Selector::OperationResult Selector::MoveToSlot(uint8_t slot) {