diff --git a/Makefile b/Makefile
index b387b9d4c..b920acc7c 100644
--- a/Makefile
+++ b/Makefile
@@ -94,6 +94,11 @@ deps:
 telegraf:
 	go build -ldflags "$(LDFLAGS)" ./cmd/telegraf
 
+# Used by dockerfile builds
+.PHONY: go-install
+go-install:
+	go install -ldflags "-w -s $(LDFLAGS)" ./cmd/telegraf
+
 .PHONY: test
 test:
 	go test -short $(race_detector) ./...
diff --git a/scripts/alpine.docker b/scripts/alpine.docker
index 35083e5a3..395cbd8a3 100644
--- a/scripts/alpine.docker
+++ b/scripts/alpine.docker
@@ -1,10 +1,10 @@
-FROM golang:1.13.13 as builder
+FROM golang:1.14.7 as builder
 WORKDIR /go/src/github.com/influxdata/telegraf
 
 COPY . /go/src/github.com/influxdata/telegraf
 RUN CGO_ENABLED=0 make go-install
 
-FROM alpine:3.6
+FROM alpine:3.12
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
 RUN apk add --no-cache iputils ca-certificates net-snmp-tools procps lm_sensors && \
     update-ca-certificates
diff --git a/scripts/stretch.docker b/scripts/stretch.docker
index 7dbd02683..642421513 100644
--- a/scripts/stretch.docker
+++ b/scripts/stretch.docker
@@ -1,4 +1,4 @@
-FROM golang:1.13.13 as builder
+FROM golang:1.14.7-stretch as builder
 WORKDIR /go/src/github.com/influxdata/telegraf
 
 COPY . /go/src/github.com/influxdata/telegraf