diff --git a/.circleci/config.yml b/.circleci/config.yml
index 78a4f25..2637fde 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -5,7 +5,7 @@ jobs:
     docker:
       - image: public.ecr.aws/shadowrobot/build-tools:focal-noetic
         environment:
-          toolset_branch: master
+          toolset_branch: lint
           server_type: circle
           ros_release_name: noetic
           ubuntu_version_name: focal
diff --git a/aws.yml b/aws.yml
index 6a95c81..e20780c 100644
--- a/aws.yml
+++ b/aws.yml
@@ -9,7 +9,7 @@ settings:
     tag: focal-noetic
   template_project_name: template_unit_tests_and_code_coverage
   toolset:
-    branch: master
+    branch: lint
     modules:
       - check_cache
       - code_coverage