diff --git a/Dockerfile b/Dockerfile
index 022ac9a..a4486de 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,15 +1,16 @@
-FROM golang:1.3-wheezy
+FROM golang:1.6-wheezy
 MAINTAINER Abhishek Lekshmanan "abhishek.lekshmanan@gmail.com"
 
-ENV CEPH_VERSION giant
+ENV CEPH_VERSION hammer
 
 RUN echo deb http://ceph.com/debian-$CEPH_VERSION/ wheezy main | tee /etc/apt/sources.list.d/ceph-$CEPH_VERSION.list
 
 # Running wget with no certificate checks, alternatively ssl-cert package should be installed
-RUN wget --no-check-certificate -q -O- 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | apt-key add - &&\
-    apt-get update && \
-    apt-get install -y ceph \
-    librados-dev librbd-dev libcephfs-dev
+RUN wget --no-check-certificate -q -O- 'https://ceph.com/git/?p=ceph.git;a=blob_plain;f=keys/release.asc' | apt-key add - \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends ceph ceph-mds librados-dev librbd-dev libcephfs-dev \
+    && rm -rf /var/lib/apt/lists/* \
+    && apt-get clean
 
 VOLUME /go/src/github.com/ceph/go-ceph