diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml
index b8337f6ebe..ce0ac2ef4c 100644
--- a/.github/workflows/static-checks.yaml
+++ b/.github/workflows/static-checks.yaml
@@ -63,13 +63,9 @@ jobs:
     - name: Check vendored code
       run: |
         cd ${GOPATH}/src/github.com/${{ github.repository }} && make vendor
-    # Must build before static checks as we depend on some generated code in runtime and agent
-    - name: Build
-      run: |
-        cd ${GOPATH}/src/github.com/${{ github.repository }} && make
     - name: Static Checks
       run: |
-        cd ${GOPATH}/src/github.com/${{ github.repository }} && ./ci/static-checks.sh
+        cd ${GOPATH}/src/github.com/${{ github.repository }} && make static-checks
     - name: Run Compiler Checks
       run: |
         cd ${GOPATH}/src/github.com/${{ github.repository }} && make check
diff --git a/Makefile b/Makefile
index f536c9bcf3..a877f375b0 100644
--- a/Makefile
+++ b/Makefile
@@ -29,4 +29,8 @@ $(eval $(call create_all_rules,$(COMPONENTS),$(TOOLS),$(STANDARD_TARGETS)))
 generate-protocols:
 	make -C src/agent generate-protocols
 
-.PHONY: all default
+# Some static checks rely on generated source files of components.
+static-checks: build
+	bash ci/static-checks.sh
+
+.PHONY: all default static-checks