diff --git a/.travis.yml b/.travis.yml
index 8624682..18871e2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,4 +11,4 @@ sudo: required
 install:
   - make bootstrap
 script:
-  - make test build docker-build
+  - DEIS_REGISTRY='' make test build docker-build
diff --git a/Makefile b/Makefile
index fe11d00..b3f5c64 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,8 @@
 SHORT_NAME := minio
 
-export GO15VENDOREXPERIMENT=1
-
 # dockerized development environment variables
 REPO_PATH := github.com/deis/${SHORT_NAME}
-DEV_ENV_IMAGE := quay.io/deis/go-dev:0.9.1
+DEV_ENV_IMAGE := quay.io/deis/go-dev:0.17.0
 DEV_ENV_WORK_DIR := /go/src/${REPO_PATH}
 DEV_ENV_PREFIX := docker run --rm -v ${CURDIR}:${DEV_ENV_WORK_DIR} -w ${DEV_ENV_WORK_DIR}
 DEV_ENV_CMD := ${DEV_ENV_PREFIX} ${DEV_ENV_IMAGE}
@@ -36,12 +34,10 @@ test:
 	${DEV_ENV_CMD} go test ${TEST_PACKAGES}
 
 docker-build: build
-
 	# build the main image
 	docker build --rm -t ${IMAGE} rootfs
 	docker tag ${IMAGE} ${MUTABLE_IMAGE}
 
-
 deploy: build docker-build docker-push
 
 .PHONY: all bootstrap glideup build test docker-build deploy
diff --git a/rootfs/Dockerfile b/rootfs/Dockerfile
index 043cbe0..6d76d86 100644
--- a/rootfs/Dockerfile
+++ b/rootfs/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/deis/base:0.2.0
+FROM quay.io/deis/base:0.3.1
 
 RUN adduser --system \
 	--shell /bin/bash \