diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index daf59b7..0c00b27 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -20,10 +20,12 @@ jobs:
             ADDITIONAL_DEBS: clang lld
             CC: "clang"
             CXX: "clang++"
+    env:
+      ISOLATION: "shell"
     runs-on: ubuntu-latest
     container:
       image: ros:jazzy-ros-core
     steps:
       - uses: actions/checkout@v4
       - uses: 'ros-industrial/industrial_ci@master'
-        env: {{ matrix.env }}
+        env: ${{ matrix.env }}
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5d1909b..b20d543 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -89,13 +89,8 @@ if(BUILD_TESTING)
   set(cpplint_filters
     "-whitespace/newline"
   )
-  set(cpplint_root_paths
-    "${CMAKE_CURRENT_SOURCE_DIR}/include/"
-  )
-
   ament_cpplint(
     FILTERS "${cpplint_filters}"
-    ROOT "${cpplint_root_paths}"
   )
 
   find_package(ament_cmake_clang_format REQUIRED)
diff --git a/test/generator/generator.hpp b/test/generator/generator.hpp
index d70466e..98709ba 100644
--- a/test/generator/generator.hpp
+++ b/test/generator/generator.hpp
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#ifndef TEST__GENERATOR__GENERATOR_HPP_
-#define TEST__GENERATOR__GENERATOR_HPP_
+#ifndef GENERATOR__GENERATOR_HPP_
+#define GENERATOR__GENERATOR_HPP_
 
 #include <limits>
 #include <random>
@@ -1000,4 +1000,4 @@ class RandomDataGenerator
   uint8_t ORDER_VECTOR_SIZE_UPPER_BOUND = 10;
 };
 
-#endif  // TEST__GENERATOR__GENERATOR_HPP_
+#endif  // GENERATOR__GENERATOR_HPP_