diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index fd1009574..9d755a244 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -1,4 +1,17 @@
 steps:
+  - command:
+    # https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
+    - "GOGC=20 ./scripts/find-lint.sh"
+    label: "\U0001F9F9 Lint / :go: 1.12"
+    agents:
+      # Use a larger instance as linting takes a looot of memory
+      queue: "medium"
+    plugins:
+      - docker#v3.0.1:
+          image: "golang:1.12"
+
+  - wait
+
   - command:
     - "go build ./cmd/..."
     label: "\U0001F528 Build / :go: 1.11"
@@ -34,11 +47,3 @@ steps:
     plugins:
       - docker#v3.0.1:
           image: "golang:1.12"
-
-  - command:
-    # https://github.com/golangci/golangci-lint#memory-usage-of-golangci-lint
-    - "GOGC=10 ./scripts/find-lint.sh"
-    label: "\U0001F9F9 Lint / :go: 1.12"
-    plugins:
-      - docker#v3.0.1:
-          image: "golang:1.12"