diff --git a/evaluator/autoware_control_evaluator/launch/control_evaluator.launch.xml b/evaluator/autoware_control_evaluator/launch/control_evaluator.launch.xml
index e119f1787d21b..f977916541752 100644
--- a/evaluator/autoware_control_evaluator/launch/control_evaluator.launch.xml
+++ b/evaluator/autoware_control_evaluator/launch/control_evaluator.launch.xml
@@ -9,7 +9,7 @@
       <remap from="~/input/diagnostics" to="$(var input/diagnostics)"/>
       <remap from="~/input/odometry" to="$(var input/odometry)"/>
       <remap from="~/input/trajectory" to="$(var input/trajectory)"/>
-      <remap from="~/metrics" to="/diagnostic/control_evaluator/metrics"/>
+      <remap from="~/metrics" to="/control/control_evaluator/metrics"/>
     </node>
   </group>
 </launch>
diff --git a/evaluator/autoware_planning_evaluator/launch/planning_evaluator.launch.xml b/evaluator/autoware_planning_evaluator/launch/planning_evaluator.launch.xml
index 2e358f6272379..b36e276c06944 100644
--- a/evaluator/autoware_planning_evaluator/launch/planning_evaluator.launch.xml
+++ b/evaluator/autoware_planning_evaluator/launch/planning_evaluator.launch.xml
@@ -14,7 +14,7 @@
       <remap from="~/input/reference_trajectory" to="$(var input/reference_trajectory)"/>
       <remap from="~/input/objects" to="$(var input/objects)"/>
       <remap from="~/input/modified_goal" to="$(var input/modified_goal)"/>
-      <remap from="~/metrics" to="/diagnostic/planning_evaluator/metrics"/>
+      <remap from="~/metrics" to="/planning/planning_evaluator/metrics"/>
     </node>
   </group>
 </launch>
diff --git a/evaluator/perception_online_evaluator/launch/perception_online_evaluator.launch.xml b/evaluator/perception_online_evaluator/launch/perception_online_evaluator.launch.xml
index 2ef179dbe3ff9..fc045da0302b7 100644
--- a/evaluator/perception_online_evaluator/launch/perception_online_evaluator.launch.xml
+++ b/evaluator/perception_online_evaluator/launch/perception_online_evaluator.launch.xml
@@ -6,8 +6,8 @@
     <node name="perception_online_evaluator" exec="perception_online_evaluator" pkg="perception_online_evaluator">
       <param from="$(find-pkg-share perception_online_evaluator)/param/perception_online_evaluator.defaults.yaml"/>
       <remap from="~/input/objects" to="$(var input/objects)"/>
-      <remap from="~/metrics" to="/diagnostic/perception_online_evaluator/metrics"/>
-      <remap from="~/markers" to="/diagnostic/perception_online_evaluator/markers"/>
+      <remap from="~/metrics" to="/perception/perception_online_evaluator/metrics"/>
+      <remap from="~/markers" to="/perception/perception_online_evaluator/markers"/>
     </node>
   </group>
 </launch>
diff --git a/launch/tier4_control_launch/launch/control.launch.py b/launch/tier4_control_launch/launch/control.launch.py
index a61f29014dcce..c561a8c1b9018 100644
--- a/launch/tier4_control_launch/launch/control.launch.py
+++ b/launch/tier4_control_launch/launch/control.launch.py
@@ -381,7 +381,7 @@ def launch_setup(context, *args, **kwargs):
             ("~/input/diagnostics", "/diagnostics"),
             ("~/input/odometry", "/localization/kinematic_state"),
             ("~/input/trajectory", "/planning/scenario_planning/trajectory"),
-            ("~/metrics", "/diagnostic/control_evaluator/metrics"),
+            ("~/metrics", "/control/control_evaluator/metrics"),
         ],
     )
 
diff --git a/launch/tier4_simulator_launch/launch/simulator.launch.xml b/launch/tier4_simulator_launch/launch/simulator.launch.xml
index 97b07410d108a..8ee3809cb19d2 100644
--- a/launch/tier4_simulator_launch/launch/simulator.launch.xml
+++ b/launch/tier4_simulator_launch/launch/simulator.launch.xml
@@ -147,7 +147,7 @@
   <!-- Diagnostic Converter -->
   <group if="$(var launch_diagnostic_converter)">
     <node name="diagnostic_converter" exec="diagnostic_converter" pkg="diagnostic_converter" output="screen">
-      <param name="diagnostic_topics" value="[/diagnostic/planning_evaluator/metrics, /diagnostic/control_evaluator/metrics, /diagnostics_err]"/>
+      <param name="diagnostic_topics" value="[/planning/planning_evaluator/metrics, /diagnostic/control_evaluator/metrics, /diagnostics_err]"/>
     </node>
   </group>