diff --git a/CMakeLists.txt b/CMakeLists.txt
index c0ccd6a..7328b02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,6 +16,7 @@ set(msg_dependencies
 rosidl_generate_interfaces(${PROJECT_NAME}
   ${msg_files}
   DEPENDENCIES ${msg_dependencies}
+  ADD_LINTER_TESTS
 )
 
 ament_auto_package()
diff --git a/package.xml b/package.xml
index 7bf5997..f92af82 100644
--- a/package.xml
+++ b/package.xml
@@ -8,6 +8,7 @@
   <maintainer email="mfc@leodrive.ai">M. Fatih Cırıt</maintainer>
   <maintainer email="ryohsuke.mitsudome@tier4.jp">Ryohsuke Mitsudome</maintainer>
   <maintainer email="yukihiro.saito@tier4.jp">Yukihiro Saito</maintainer>
+  <maintainer email="yutaka.kondo@tier4.jp">Yutaka Kondo</maintainer>
   <license>Apache License 2.0</license>
 
   <buildtool_depend>ament_cmake_auto</buildtool_depend>