diff --git a/.buildkite/pipeline.yaml b/.buildkite/pipeline.yaml
index 5608eb7c9..21d3245af 100644
--- a/.buildkite/pipeline.yaml
+++ b/.buildkite/pipeline.yaml
@@ -7,7 +7,7 @@ steps:
       DENDRITE_LINT_DISABLE_GC: "1"
     plugins:
       - docker#v3.0.1:
-          image: "golang:1.11-stretch"
+          image: "golang:1.11"
 
   - command:
     - "go test ./..."
@@ -17,7 +17,7 @@ steps:
       DENDRITE_LINT_DISABLE_GC: "1"
     plugins:
       - docker#v3.0.1:
-          image: "golang:1.11-stretch"
+          image: "golang:1.11"
 
   - command:
     - "go build ./cmd/..."
@@ -27,7 +27,7 @@ steps:
       DENDRITE_LINT_DISABLE_GC: "1"
     plugins:
       - docker#v3.0.1:
-          image: "golang:1.12-stretch"
+          image: "golang:1.12"
 
   - command:
     - "go test ./..."
@@ -37,7 +37,7 @@ steps:
       DENDRITE_LINT_DISABLE_GC: "1"
     plugins:
       - docker#v3.0.1:
-          image: "golang:1.12-stretch"
+          image: "golang:1.12"
 
   - command:
     - "./scripts/find-lint.sh"
@@ -47,4 +47,4 @@ steps:
       DENDRITE_LINT_DISABLE_GC: "1"
     plugins:
       - docker#v3.0.1:
-          image: "golang:1.12-stretch"
+          image: "golang:1.12"