diff --git a/clair/Dockerfile b/clair/Dockerfile
index ec9d958..e4f6c82 100644
--- a/clair/Dockerfile
+++ b/clair/Dockerfile
@@ -1,28 +1,22 @@
-FROM alpine:latest as builder
+FROM golang:alpine as builder
+
+RUN apk --no-cache add \
+	ca-certificates \
+	git
+
+ENV PATH /go/bin:/usr/local/go/bin:$PATH
+ENV GOPATH /go
+
+RUN go get github.com/coreos/clair/cmd/clair
+
+FROM alpine:latest
 
 RUN apk --no-cache add \
-	bzr \
 	ca-certificates \
 	git \
 	rpm \
 	xz
 
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-RUN buildDeps=' \
-		go \
-		gcc \
-		g++ \
-		libc-dev \
-		libgcc \
-	' \
-	set -x \
-	&& apk --no-cache add $buildDeps \
-	&& go get github.com/coreos/clair/cmd/clair \
-	&& echo "Build complete."
-
-FROM alpine:latest
 COPY --from=builder /go/bin/clair /usr/bin/clair
-COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs
+
 ENTRYPOINT [ "clair" ]
diff --git a/micro/Dockerfile b/micro/Dockerfile
index 57cd157..a0f38d6 100644
--- a/micro/Dockerfile
+++ b/micro/Dockerfile
@@ -1,29 +1,25 @@
-FROM alpine:latest as builder
+FROM golang:alpine as builder
 LABEL maintainer "Christian Koep <christiankoep@gmail.com>"
 
+RUN apk --no-cache add \
+	ca-certificates \
+	git \
+	make
+
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
 ENV MICRO_VERSION nightly
 
-RUN buildDeps=' \
-		go \
-		git \
-		gcc \
-		g++ \
-		libc-dev \
-		libgcc \
-		make \
-	' \
-	set -x \
-	&& apk --no-cache add $buildDeps \
-	&& git clone --depth 1 --branch "$MICRO_VERSION" https://github.com/zyedidia/micro /go/src/github.com/zyedidia/micro \
-	&& cd /go/src/github.com/zyedidia/micro \
-	&& mkdir -p /go/bin \
-	&& make install \
-	&& echo "Build complete."
+RUN git clone --depth 1 --branch "$MICRO_VERSION" https://github.com/zyedidia/micro /go/src/github.com/zyedidia/micro
+
+WORKDIR /go/src/github.com/zyedidia/micro
+
+RUN make install
 
 FROM alpine:latest
+
 COPY --from=builder /go/bin/micro /usr/bin/micro
 COPY --from=builder /etc/ssl/certs/ /etc/ssl/certs
+
 ENTRYPOINT [ "micro" ]
diff --git a/mop/Dockerfile b/mop/Dockerfile
index 0ed9614..9410325 100644
--- a/mop/Dockerfile
+++ b/mop/Dockerfile
@@ -5,26 +5,16 @@
 # 	--name mop \
 # 	r.j3ss.co/mop
 #
-FROM alpine:latest as builder
+FROM golang:alpine as builder
 
 RUN apk --no-cache add \
-	ca-certificates
+	ca-certificates \
+	git
 
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-RUN buildDeps=' \
-		go \
-		git \
-		gcc \
-		g++ \
-		libc-dev \
-		libgcc \
-	' \
-	set -x \
-	&& apk --no-cache add $buildDeps \
-	&& go get github.com/mop-tracker/mop/cmd/mop \
-	&& echo "Build complete."
+RUN go get github.com/mop-tracker/mop/cmd/mop
 
 FROM alpine:latest
 COPY --from=builder /go/bin/mop /usr/bin/mop
diff --git a/transfer-sh/Dockerfile b/transfer-sh/Dockerfile
index 3a2051a..366dc42 100644
--- a/transfer-sh/Dockerfile
+++ b/transfer-sh/Dockerfile
@@ -1,28 +1,20 @@
-FROM alpine:latest as builder
+FROM golang:alpine as builder
 LABEL maintainer "Jess Frazelle <jess@linux.com>"
 
+RUN	apk --no-cache add \
+	ca-certificates \
+	git
+
 ENV PATH /go/bin:/usr/local/go/bin:$PATH
 ENV GOPATH /go
 
-RUN	apk --no-cache add \
-	ca-certificates
-
 ENV TRANSFER_SH_VERSION master
 
-RUN	set -x \
-	&& apk --no-cache add \
-		bash \
-		go \
-		git \
-		gcc \
-		g++ \
-		libc-dev \
-		libgcc \
-		make \
-	&& git clone --depth 1 --branch ${TRANSFER_SH_VERSION} https://github.com/dutchcoders/transfer.sh /go/src/github.com/dutchcoders/transfer.sh \
-	&& cd /go/src/github.com/dutchcoders/transfer.sh \
-	&& go build -o /usr/bin/transfer.sh \
-	&& echo "Build complete."
+RUN	git clone --depth 1 --branch ${TRANSFER_SH_VERSION} https://github.com/dutchcoders/transfer.sh /go/src/github.com/dutchcoders/transfer.sh
+
+WORKDIR /go/src/github.com/dutchcoders/transfer.sh
+
+RUN go build -o /usr/bin/transfer.sh
 
 # Create a clean image without build dependencies
 FROM alpine:latest