diff --git a/.circleci/config.yml b/.circleci/config.yml
index 9e84a35829..093a42bdd2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -770,7 +770,10 @@ workflows:
   version: 2
   default_workflow:
     jobs:
-      - setup
+      - setup:
+          filters:
+            branches:
+              ignore: g3
       - lint:
           requires:
             - setup
@@ -900,9 +903,3 @@ workflows:
             branches:
               only:
                 - master
-
-# TODO:
-# - don't build the g3 branch
-# - verify that we are bootstrapping with the right yarn version coming from the docker image
-# - check local chrome version pulled from docker image
-# - remove /tools/ngcontainer