diff --git a/system/dummy_infrastructure/config/dummy_infrastructure.param.yaml b/system/dummy_infrastructure/config/dummy_infrastructure.param.yaml
index b7b8ff60ccbe7..06162370d3a94 100644
--- a/system/dummy_infrastructure/config/dummy_infrastructure.param.yaml
+++ b/system/dummy_infrastructure/config/dummy_infrastructure.param.yaml
@@ -1,7 +1,8 @@
 /**:
   ros__parameters:
     update_rate_hz: 10.0
-    use_first_command: true
+    use_first_command: false
+    use_instrument_id: false
     instrument_id: '0'
     approval: true
-    is_finalized: false
+    is_finalized: true
diff --git a/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp b/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp
index 69ec02134d1ab..b23e41eedd7a9 100644
--- a/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp
+++ b/system/dummy_infrastructure/include/dummy_infrastructure/dummy_infrastructure_node.hpp
@@ -41,6 +41,7 @@ class DummyInfrastructureNode : public rclcpp::Node
   {
     double update_rate_hz{};
     bool use_first_command{};
+    bool use_instrument_id{};
     std::string instrument_id{};
     bool approval{};
     bool is_finalized{};
diff --git a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp b/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp
index 8e9ffd5a0578b..17070621708f0 100644
--- a/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp
+++ b/system/dummy_infrastructure/src/dummy_infrastructure_node/dummy_infrastructure_node.cpp
@@ -49,14 +49,22 @@ bool update_param(
 
 boost::optional<InfrastructureCommand> findCommand(
   const InfrastructureCommandArray & command_array, const std::string & instrument_id,
-  const bool use_first_command)
+  const bool use_first_command, const bool use_instrument_id)
 {
   if (use_first_command && !command_array.commands.empty()) {
     return command_array.commands.front();
   }
 
+  if (use_instrument_id) {
+    for (const auto & command : command_array.commands) {
+      if (command.id == instrument_id) {
+        return command;
+      }
+    }
+  }
+
   for (const auto & command : command_array.commands) {
-    if (command.id == instrument_id) {
+    if (command.state >= 1) {
       return command;
     }
   }
@@ -75,6 +83,7 @@ DummyInfrastructureNode::DummyInfrastructureNode(const rclcpp::NodeOptions & nod
   // Parameter
   node_param_.update_rate_hz = declare_parameter<double>("update_rate_hz", 10.0);
   node_param_.use_first_command = declare_parameter<bool>("use_first_command", true);
+  node_param_.use_instrument_id = declare_parameter<bool>("use_instrument_id", false);
   node_param_.instrument_id = declare_parameter<std::string>("instrument_id", "");
   node_param_.approval = declare_parameter<bool>("approval", false);
   node_param_.is_finalized = declare_parameter<bool>("is_finalized", false);
@@ -95,7 +104,9 @@ DummyInfrastructureNode::DummyInfrastructureNode(const rclcpp::NodeOptions & nod
 
 void DummyInfrastructureNode::onCommandArray(const InfrastructureCommandArray::ConstSharedPtr msg)
 {
-  command_array_ = msg;
+  if (!msg->commands.empty()) {
+    command_array_ = msg;
+  }
 }
 
 rcl_interfaces::msg::SetParametersResult DummyInfrastructureNode::onSetParam(
@@ -110,6 +121,7 @@ rcl_interfaces::msg::SetParametersResult DummyInfrastructureNode::onSetParam(
     // Update params
     update_param(params, "update_rate_hz", p.update_rate_hz);
     update_param(params, "use_first_command", p.use_first_command);
+    update_param(params, "use_instrument_id", p.use_instrument_id);
     update_param(params, "instrument_id", p.instrument_id);
     update_param(params, "approval", p.approval);
     update_param(params, "is_finalized", p.is_finalized);
@@ -143,13 +155,14 @@ void DummyInfrastructureNode::onTimer()
     return;
   }
 
-  const auto command =
-    findCommand(*command_array_, node_param_.instrument_id, node_param_.use_first_command);
+  const auto command = findCommand(
+    *command_array_, node_param_.instrument_id, node_param_.use_first_command,
+    node_param_.use_instrument_id);
 
   VirtualTrafficLightState state;
   state.stamp = get_clock()->now();
   state.id = command ? command->id : node_param_.instrument_id;
-  state.type = "dummy_infrastructure";
+  state.type = command ? command->type : "dummy_infrastructure";
   state.approval = command ? node_param_.approval : false;
   state.is_finalized = node_param_.is_finalized;