diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index cb80271f..1f9b1f17 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -5,7 +5,7 @@ common/rtc_manager_rviz_plugin/** taiki.tanaka@tier4.jp tomoya.kimura@tier4.jp
 common/tier4_automatic_goal_rviz_plugin/** dawid.moszynski@robotec.ai kyoichi.sugahara@tier4.jp satoshi.ota@tier4.jp shumpei.wakabayashi@tier4.jp
 common/tier4_calibration_msgs/** taiki.tamaka@tier4.jp tomoya.kimura@tier4.jp
 common/tier4_calibration_rviz_plugin/** tomoya.kimura@tier4.jp
-common/tier4_control_rviz_plugin/** taiki.tanaka@tier4.jp
+common/tier4_control_rviz_plugin/** akiro.harada@tier4.jp taiki.tanaka@tier4.jp
 common/tier4_debug_rviz_plugin/** takayuki.murooka@tier4.jp
 common/tier4_debug_tools/** ryohsuke.mitsudome@tier4.jp
 common/tier4_logging_level_configure_rviz_plugin/** kosuke.takeuchi@tier4.jp satoshi.ota@tier4.jp takamasa.horibe@tier4.jp
@@ -15,10 +15,12 @@ common/tier4_target_object_type_rviz_plugin/** takamasa.horibe@tier4.jp
 control/control_debug_tools/** takayuki.murooka@tier4.jp zhe.shen@tier4.jp
 control/stop_accel_evaluator/** takayuki.murooka@tier4.jp
 control/vehicle_cmd_analyzer/** taichi.hirano@tier4.jp
+control_data_collecting_tool/** asei.inoue@proxima-ai-tech.com kosuke.takeuchi@tier4.jp masayuki.aino@proxima-ai-tech.com takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp toru.hishinuma@proxima-ai-tech.com
 driving_environment_analyzer/** satoshi.ota@tier4.jp
 evaluation/tier4_metrics_rviz_plugin/** fumiya.watanabe@tier4.jp kosuke.takeuchi@tier4.jp kyoichi.sugahara@tier4.jp maxime.clement@tier4.jp satoshi.ota@tier4.jp
-localization/deviation_estimation_tools/deviation_estimator/** koji.minoda@tier4.jp
-localization/deviation_estimation_tools/deviation_evaluator/** koji.minoda@tier4.jp
+localization/deviation_estimation_tools/deviation_estimator/** kento.yabuuchi.2@tier4.jp koji.minoda@tier4.jp masahiro.sakamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
+localization/deviation_estimation_tools/deviation_evaluator/** kento.yabuuchi.2@tier4.jp koji.minoda@tier4.jp masahiro.sakamoto@tier4.jp shintaro.sakoda@tier4.jp taiki.yamada@tier4.jp yamato.ando@tier4.jp
+planning/autoware_route_client/** fumiya.watanabe@tier4.jp
 planning/autoware_rtc_replayer/** fumiya.watanabe@tier4.jp taiki.tanaka@tier4.jp
 planning/planning_debug_tools/** taiki.tanaka@tier4.jp takamasa.horibe@tier4.jp takayuki.murooka@tier4.jp
 simulator/simulator_compatibility_test/** shpark@morai.ai shumpei.wakabayashi@tier4.jp tomoya.kimura@tier4.jp