diff --git a/.travis.yml b/.travis.yml
index 25a019b..700337a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,13 +1,10 @@
 language: go
 
 go:
-  - 1.5
+  - 1.8
 
 sudo: false
 
-env:
-  - GO15VENDOREXPERIMENT=1
-
 install:
   - mkdir -p "$GOPATH/src/willnorris.com/go"
   - mv "$TRAVIS_BUILD_DIR" "$GOPATH/src/willnorris.com/go/imageproxy"
diff --git a/Dockerfile b/Dockerfile
index dd9ed20..e2d3560 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,4 +1,4 @@
-FROM google/golang
+FROM golang:1.8
 MAINTAINER Sevki <s@sevki.org>
 
 ADD . /go/src/willnorris.com/go/imageproxy