diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index d1beea44..617238c2 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -73,11 +73,13 @@ jobs:
           # No need to download cached dependencies when running gofmt.
           cache: false
 
-      - name: Run gofmt
+      - name: Install goimports
         run: |
-          # -l: list files that were reformatted
-          # -w: write back formatted files to disk
-          gofmt -l -w ./
+          go install golang.org/x/tools/cmd/goimports@latest
+
+      - name: Run make fmt
+        run: |
+          make fmt
 
       - name: Run go mod tidy
         run: |