diff --git a/Makefile b/Makefile
index 47f7e9e..b9562e0 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ glideup:
 
 build:
 	mkdir -p ${BINDIR}
-	${DEV_ENV_PREFIX} -e CGO_ENABLED=0 ${DEV_ENV_IMAGE} go build -a -installsuffix cgo -ldflags '-s' -o $(BINDIR)/boot boot.go || exit 1
+	${DEV_ENV_CMD} go build -ldflags '-s' -o $(BINDIR)/boot boot.go || exit 1
 
 test:
 	${DEV_ENV_CMD} go test ${TEST_PACKAGES}
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 6621b8b..616b6b7 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -1,13 +1,21 @@
-FROM ubuntu:14.04
-
-ENV MINIOHOME /home/minio
-ENV MINIOUSER minio
-ENV WORKFLOW_RELEASE=2.0.0-dev
-RUN useradd -m -d $MINIOHOME $MINIOUSER
-RUN apt-get update -y && apt-get install -y -q ca-certificates curl
-RUN curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.OFFICIAL.2015-09-05T23-43-46Z -o /usr/bin/mc
-RUN chmod 755 /usr/bin/mc
+FROM quay.io/deis/base:0.2.0
+
+RUN adduser --system \
+	--shell /bin/bash \
+	--disabled-password \
+	--home /home/minio \
+	--group \
+	minio
+
 COPY . /
+
+RUN curl -f -SL https://dl.minio.io/client/mc/release/linux-amd64/archive/mc.OFFICIAL.2015-09-05T23-43-46Z -o /usr/bin/mc \
+	&& chmod 755 /usr/bin/mc \
+	&& mkdir /home/minio/.minio \
+	&& chown minio:minio /home/minio/.minio
+
 USER minio
-RUN mkdir /home/minio/.minio
+
 CMD ["/bin/boot"]
+
+ENV WORKFLOW_RELEASE=2.0.0