diff --git a/.circleci/config.yml b/.circleci/config.yml
index d1c70d8..b485adc 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -151,55 +151,88 @@ workflows:
               ignore:
                 - main
                 - /version-.*/
-                - /pull\/.*/
             tags:
               ignore: /.*/
 
       - bazelrc:
+          filters:
+            branches:
+              ignore: 
+                - /pull\/.*/
+                - /renovate\/.*/
           context:
             - BuildTools
           requires:
             - setup
 
       - build:
+          name: build-trunk
+          filters:
+            branches:
+              ignore:
+                - /pull\/.*/
+                - /renovate\/.*/
           requires:
             - bazelrc
 
+      - build:
+          name: build-fork
+          filters:
+            branches:
+              only:
+                - /pull\/.*/
+                - /renovate\/.*/
+          requires:
+            - setup
+
       - maybe_release:
+          filters:
+            branches:
+              ignore:
+                - /pull\/.*/
           context:
             - Publish
           requires:
-            - build
+            - build-trunk
 
       - test:
+          name: test-trunk
+          filters:
+            branches:
+              ignore:
+                - /pull\/.*/
+                - /renovate\/.*/
           requires:
-            - build
-
-      - coverage:
-          requires:
-            - build
+            - build-trunk
 
-  build_and_test_pr_fork:
-    jobs:
-      - setup:
+      - test:
+          name: test-fork
           filters:
             branches:
               only:
-                - /pull\/.*/
-            tags:
-              ignore: /.*/
-
-      - build:
+                - /pull\/.*./
+                - /renovate\/.*/
           requires:
-            - setup
+            - build-fork
 
-      - test:
+      - coverage:
+          name: coverage-trunk
+          filters:
+            branches:
+              ignore:
+                - /pull\/.*/
           requires:
-            - build
+            - build-trunk
 
       - coverage:
+          name: coverage-fork
+          filters:
+            branches:
+              only:
+                - /pull\/.*/
+                - /renovate\/.*/
           requires:
-            - build
+            - build-fork
 
   build_and_test_main:
     when: