diff --git a/dockerfiles/alpine/Dockerfile b/dockerfiles/alpine/Dockerfile
index afd914c..6322b66 100644
--- a/dockerfiles/alpine/Dockerfile
+++ b/dockerfiles/alpine/Dockerfile
@@ -1,6 +1,7 @@
-ARG base_image=alpine:edge
+ARG base_image=alpine:latest
+ARG builder_image=concourse/golang-builder
 
-FROM golang:1 as builder
+FROM ${builder_image} as builder
 COPY . /src
 WORKDIR /src
 ENV CGO_ENABLED 0
diff --git a/dockerfiles/ubuntu/Dockerfile b/dockerfiles/ubuntu/Dockerfile
index aa5e11c..4d934c9 100644
--- a/dockerfiles/ubuntu/Dockerfile
+++ b/dockerfiles/ubuntu/Dockerfile
@@ -1,6 +1,7 @@
-ARG base_image=ubuntu:bionic
+ARG base_image
+ARG builder_image=concourse/golang-builder
 
-FROM concourse/golang-builder as builder
+FROM ${builder_image} as builder
 COPY . /src
 WORKDIR /src
 ENV CGO_ENABLED 0