diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 791a45ee95..98d195af40 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -34,9 +34,10 @@ jobs:
         debug: false
         config-file: ./.github/codeql/codeql-config.yml              
     
-    # Autobuild attempts to build any compiled languages
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v2    
+    - name: Build
+      run: |
+        make setup-go-work
+        make build-linux-amd64
 
     # Perform Analysis
     - name: Perform CodeQL Analysis
diff --git a/build/release.mk b/build/release.mk
index e48c3d70b1..46b5c5fcb9 100644
--- a/build/release.mk
+++ b/build/release.mk
@@ -1,6 +1,8 @@
 dist: | check-style test package
 
-build-linux:
+build-linux: build-linux-amd64 build-linux-arm64
+
+build-linux-amd64:
 	@echo Build Linux amd64
 ifeq ($(BUILDER_GOOS_GOARCH),"linux_amd64")
 	env GOOS=linux GOARCH=amd64 $(GO) build -o $(GOBIN) $(GOFLAGS) -trimpath -ldflags '$(LDFLAGS)' ./...
@@ -8,6 +10,8 @@ else
 	mkdir -p $(GOBIN)/linux_amd64
 	env GOOS=linux GOARCH=amd64 $(GO) build -o $(GOBIN)/linux_amd64 $(GOFLAGS) -trimpath -ldflags '$(LDFLAGS)' ./...
 endif
+
+build-linux-arm64:
 	@echo Build Linux arm64
 ifeq ($(BUILDER_GOOS_GOARCH),"linux_arm64")
 	env GOOS=linux GOARCH=arm64 $(GO) build -o $(GOBIN) $(GOFLAGS) -trimpath -ldflags '$(LDFLAGS)' ./...