diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 2d0a699a93..1de397e393 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -37,33 +37,37 @@ jobs:
             shared_queues_vendor
 
   ament_lint_cpp: # Linters applicable to C++ packages
-    name: ament_${{ matrix.linter }}
+    name: ament_${{ matrix.linter }}_${{ matrix.package_name }}
     runs-on: ubuntu-latest
     container:
       image: rostooling/setup-ros-docker:ubuntu-focal-ros-rolling-ros-base-latest
     strategy:
       fail-fast: false
       matrix:
-          linter: [cppcheck, cpplint, uncrustify]
+        linter: [cppcheck, cpplint, uncrustify]
+        package_name:
+          - rosbag2_compression
+          - rosbag2_compression_zstd
+          - rosbag2_cpp
+          - rosbag2_examples_cpp
+          - rosbag2_py
+          - rosbag2_storage
+          - rosbag2_storage_sqlite3
+          - rosbag2_storage_mcap
+          - rosbag2_test_common
+          - rosbag2_tests
+          - rosbag2_transport
+        exclude:
+          - linter: uncrustify
+            package_name: rosbag2_storage_mcap
+
     steps:
     - uses: actions/checkout@v2
     - uses: ros-tooling/action-ros-lint@v0.1
       with:
         linter: ${{ matrix.linter }}
         distribution: rolling
-        package-name: |
-            rosbag2_compression
-            rosbag2_compression_zstd
-            rosbag2_cpp
-            rosbag2_examples_cpp
-            rosbag2_py
-            rosbag2_storage
-            rosbag2_storage_sqlite3
-            rosbag2_storage_mcap
-            rosbag2_test_common
-            rosbag2_tests
-            rosbag2_transport
-            shared_queues_vendor
+        package-name: ${{ matrix.package_name }}
 
   ament_lint_python: # Linters applicable to Python packages
     name: ament_${{ matrix.linter }}