diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69b9621f..d76e8958 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@
 ## Changes since v4.0.0
 
 - [#227](https://github.com/pusher/oauth2_proxy/pull/227) Add Keycloak provider (@Ofinka)
-- [#271](https://github.com/pusher/oauth2_proxy/pull/271) Support Go 1.13 (@dio)
+- [#273](https://github.com/pusher/oauth2_proxy/pull/273) Support Go 1.13 (@dio)
+- [#275](https://github.com/pusher/oauth2_proxy/pull/275) docker: build from debian buster (@syscll)
 
 # v4.0.0
 
diff --git a/Dockerfile b/Dockerfile
index ba07b3f2..2a29bf0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.13-stretch AS builder
+FROM golang:1.13-buster AS builder
 
 # Download tools
 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
diff --git a/Dockerfile.arm64 b/Dockerfile.arm64
index 2bd671a4..df4fc825 100644
--- a/Dockerfile.arm64
+++ b/Dockerfile.arm64
@@ -1,4 +1,4 @@
-FROM golang:1.13-stretch AS builder
+FROM golang:1.13-buster AS builder
 
 # Download tools
 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1
diff --git a/Dockerfile.armv6 b/Dockerfile.armv6
index 9b56ea57..908d2d95 100644
--- a/Dockerfile.armv6
+++ b/Dockerfile.armv6
@@ -1,4 +1,4 @@
-FROM golang:1.13-stretch AS builder
+FROM golang:1.13-buster AS builder
 
 # Download tools
 RUN curl -sfL https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s -- -b $(go env GOPATH)/bin v1.17.1