diff --git a/Makefile b/Makefile
index 4521c5d7f..e5b0ce8de 100644
--- a/Makefile
+++ b/Makefile
@@ -113,9 +113,7 @@ clean:
 
 .PHONY: docker-image
 docker-image:
-	./scripts/build.py --package --platform=linux --arch=amd64
-	cp build/telegraf*$(COMMIT)*.deb .
-	docker build -f scripts/dev.docker --build-arg "package=telegraf*$(COMMIT)*.deb" -t "telegraf-dev:$(COMMIT)" .
+	docker build -f scripts/stretch.docker -t "telegraf:$(COMMIT)" .
 
 plugins/parsers/influx/machine.go: plugins/parsers/influx/machine.go.rl
 	ragel -Z -G2 $^ -o $@
diff --git a/Dockerfile.alpine b/scripts/alpine.docker
similarity index 89%
rename from Dockerfile.alpine
rename to scripts/alpine.docker
index d5ad52523..0103a16d4 100644
--- a/Dockerfile.alpine
+++ b/scripts/alpine.docker
@@ -5,7 +5,7 @@ WORKDIR /go/src/github.com/influxdata/telegraf
 COPY Gopkg.toml Gopkg.lock ./
 RUN dep ensure -vendor-only
 COPY . /go/src/github.com/influxdata/telegraf
-RUN CGO_ENABLED=0 go install ./cmd/...
+RUN CGO_ENABLED=0 make go-install
 
 FROM alpine:3.6
 RUN echo 'hosts: files dns' >> /etc/nsswitch.conf
@@ -16,6 +16,6 @@ COPY etc/telegraf.conf /etc/telegraf/telegraf.conf
 
 EXPOSE 8125/udp 8092/udp 8094
 
-COPY docker/entrypoint.sh /entrypoint.sh
+COPY scripts/docker-entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["telegraf"]
diff --git a/scripts/dev.docker b/scripts/dev.docker
deleted file mode 100644
index 902c7f9aa..000000000
--- a/scripts/dev.docker
+++ /dev/null
@@ -1,8 +0,0 @@
-FROM debian:stretch
-ARG package
-ADD ${package} ${package}
-RUN dpkg -i ${package}
-
-EXPOSE 8125/udp 8092/udp 8094
-
-CMD ["telegraf"]
diff --git a/docker/entrypoint.sh b/scripts/docker-entrypoint.sh
similarity index 100%
rename from docker/entrypoint.sh
rename to scripts/docker-entrypoint.sh
diff --git a/Dockerfile b/scripts/stretch.docker
similarity index 88%
rename from Dockerfile
rename to scripts/stretch.docker
index 7c97201fc..906e0c504 100644
--- a/Dockerfile
+++ b/scripts/stretch.docker
@@ -5,7 +5,7 @@ WORKDIR /go/src/github.com/influxdata/telegraf
 COPY Gopkg.toml Gopkg.lock ./
 RUN dep ensure -vendor-only
 COPY . /go/src/github.com/influxdata/telegraf
-RUN go install ./cmd/...
+RUN make go-install
 
 FROM buildpack-deps:stretch-curl
 COPY --from=builder /go/bin/* /usr/bin/
@@ -13,6 +13,6 @@ COPY etc/telegraf.conf /etc/telegraf/telegraf.conf
 
 EXPOSE 8125/udp 8092/udp 8094
 
-COPY docker/entrypoint.sh /entrypoint.sh
+COPY scripts/docker-entrypoint.sh /entrypoint.sh
 ENTRYPOINT ["/entrypoint.sh"]
 CMD ["telegraf"]