diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6b74680a99652..278ef30c4964c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -35,8 +35,9 @@ repos:
       - id: yamllint
 
   - repo: https://github.com/tier4/pre-commit-hooks-ros
-    rev: v0.6.0
+    rev: v0.8.0
     hooks:
+      - id: flake8-ros
       - id: prettier-xacro
       - id: prettier-launch-xml
       - id: prettier-package-xml
@@ -65,22 +66,6 @@ repos:
       - id: black
         args: [--line-length=100]
 
-  - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
-    hooks:
-      - id: flake8
-        additional_dependencies:
-          [
-            flake8-blind-except,
-            flake8-builtins,
-            flake8-class-newline,
-            flake8-comprehensions,
-            flake8-deprecated,
-            flake8-docstrings,
-            flake8-import-order,
-            flake8-quotes,
-          ]
-
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v13.0.1
     hooks:
diff --git a/common/tier4_debug_tools/package.xml b/common/tier4_debug_tools/package.xml
index fa447301d36c3..7387ef6bb1e9f 100644
--- a/common/tier4_debug_tools/package.xml
+++ b/common/tier4_debug_tools/package.xml
@@ -17,8 +17,8 @@
   <depend>tier4_debug_msgs</depend>
 
   <exec_depend>launch_ros</exec_depend>
-  <exec_depend>rclpy</exec_depend>
   <exec_depend condition="$ROS_PYTHON_VERSION == 3">python3-rtree</exec_depend>
+  <exec_depend>rclpy</exec_depend>
   <test_depend>ament_lint_auto</test_depend>
   <test_depend>autoware_lint_common</test_depend>