diff --git a/Dockerfile b/Dockerfile
index ca5716b6..17182daa 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 # use a builder image for building cloudflare
 ARG TARGET_GOOS
 ARG TARGET_GOARCH
-FROM golang:1.13.3 as builder
+FROM golang:1.15.2 as builder
 ENV GO111MODULE=on \
     CGO_ENABLED=0 \
     TARGET_GOOS=${TARGET_GOOS} \
diff --git a/dev.Dockerfile b/dev.Dockerfile
index dcf67365..d2ed788b 100644
--- a/dev.Dockerfile
+++ b/dev.Dockerfile
@@ -1,4 +1,9 @@
-FROM golang:1.12 as builder
+FROM golang:1.15.2 as builder
+ENV GO111MODULE=on \
+    CGO_ENABLED=0
 WORKDIR /go/src/github.com/cloudflare/cloudflared/
 RUN apt-get update
 COPY . .
+# compile cloudflared
+RUN make cloudflared
+RUN cp /go/src/github.com/cloudflare/cloudflared/cloudflared /usr/local/bin/
\ No newline at end of file