diff --git a/Dockerfile b/Dockerfile
index 6061160..ad42f2d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,7 +3,6 @@ FROM ubuntu:xenial
 RUN apt-get update && apt-get install -y \
   apt-transport-https \
   git \
-  golang-go \
   software-properties-common \
   uuid-runtime \
   wget
@@ -11,11 +10,14 @@ RUN apt-get update && apt-get install -y \
 RUN wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add -
 RUN apt-add-repository 'deb https://download.ceph.com/debian-luminous/ xenial main'
 
+RUN add-apt-repository ppa:gophers/archive
+
 RUN apt-get update && apt-get install -y \
   ceph \
   libcephfs-dev \
   librados-dev \
-  librbd-dev
+  librbd-dev \
+  golang-1.10-go
 
 ENV GOPATH /go
 WORKDIR /go/src/github.com/ceph/go-ceph
diff --git a/entrypoint.sh b/entrypoint.sh
index 4d207fb..54dc34b 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -6,7 +6,9 @@ mkdir /tmp/ceph
 /micro-osd.sh /tmp/ceph
 export CEPH_CONF=/tmp/ceph/ceph.conf
 
-go vet ./...
+export PATH=/usr/lib/go-1.10/bin:$PATH
+
 go get -t -v ./...
-go list ./...
+#go vet ./...
+#go list ./...
 go test -v $(go list ./... | grep -v cephfs)