diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml
index abfa706..add7511 100644
--- a/.github/workflows/pull_request.yml
+++ b/.github/workflows/pull_request.yml
@@ -23,11 +23,20 @@ jobs:
           go build -v ./...
           go test -v ./...
 
-      # TODO: Uncomment this when we are done fixing this error on the anysphere side.
-      # - name: Lint
-      #   uses: golangci/golangci-lint-action@v3
-      #   with:
-      #     version: v1.52.2
+      - name: Lint (external action)
+        if: vars.USE_LOCAL_LINTER != 'true'
+        uses: golangci/golangci-lint-action@v3
+        with:
+          version: v1.52.2
+
+      - name: Lint (local)
+        if: vars.USE_LOCAL_LINTER == 'true'
+        run: |
+          # Install golangci-lint
+          curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.2
+          
+          # Run linter
+          $(go env GOPATH)/bin/golangci-lint run
 
       - name: Build apt_query binaries
         run: | #shell