diff --git a/src/modelec_strat/src/strat_fms.cpp b/src/modelec_strat/src/strat_fms.cpp
index d2081e9..c28585c 100644
--- a/src/modelec_strat/src/strat_fms.cpp
+++ b/src/modelec_strat/src/strat_fms.cpp
@@ -37,6 +37,7 @@ namespace Modelec
                 team_selected_ = true;
                 team_id_ = msg->team_id;
                 nav_->SetTeamId(team_id_);
+                nav_->SetSpawn(msg->name);
             });
 
         reset_strat_sub_ = create_subscription<std_msgs::msg::Empty>(
@@ -134,8 +135,6 @@ namespace Modelec
             {
                 RCLCPP_INFO_ONCE(get_logger(), "State: WAIT_START - Match starting");
 
-                nav_->SetSpawn(modelec_interfaces::msg::Spawn::TOP);
-
                 rclcpp::sleep_for(std::chrono::milliseconds(300));
 
                 std_msgs::msg::Bool start_odo_msg;