diff --git a/.github/workflows/staging-image-tester.yml b/.github/workflows/staging-image-tester.yml
index 30c5eda9f..138674e6f 100644
--- a/.github/workflows/staging-image-tester.yml
+++ b/.github/workflows/staging-image-tester.yml
@@ -23,7 +23,7 @@ jobs:
     - name: Set up Go 1.x
       uses: actions/setup-go@v4
       with:
-        go-version: 1.19
+        go-version: '1.20'
       id: go
 
     - name: Check out code into the Go module directory
@@ -33,5 +33,14 @@ jobs:
       run: |
         go get -v -t -d ./...
 
-    - name: Test
-      run: make build.image/multiarch
+    - name: Test build on amd64
+      run: make build.image-amd64
+
+    - name: Clean
+      run: make clean
+
+    - name: Test build on arm64
+      run: make build.image-arm64
+
+    - name: Clean
+      run: make clean
diff --git a/Makefile b/Makefile
index f077f317d..e32015fab 100644
--- a/Makefile
+++ b/Makefile
@@ -46,8 +46,11 @@ endif
 
 .PHONY: go-lint
 
+golangci-lint:
+	@command -v golangci-lint > /dev/null || curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.53.3
+
 # Run the golangci-lint tool
-go-lint:
+go-lint: golangci-lint
 	golangci-lint run --timeout=15m ./...
 
 .PHONY: licensecheck
@@ -167,6 +170,7 @@ build.mini:
 
 clean:
 	@rm -rf build
+	@go clean -cache
 
  # Builds and push container images to the staging bucket.
 .PHONY: release.staging