diff --git a/Dockerfile b/Dockerfile
index 4d260ed63ce3975bb1038cd517fd3ac1105cc249..5626b51bd11336834df5e57103a05b1e1e6d3354 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 #
 # abc Dockerfile
-# docker build --build-arg ABC_BUILD=oss -t abc .
+# docker build --build-arg ABC_BUILD=oss -t aviaryan/abc .
+# private: docker build --build-arg ABC_BUILD=noss -t abc .
 # docker volume create --name abc
 # docker run -i --rm -v abc:/root abc login google
 # root is $HOME, -i for stdin, --rm to remove container
@@ -28,7 +29,12 @@ ENV ABC_BUILD ${ABC_BUILD}
 
 # Run build
 RUN cd /go/src/github.com/appbaseio/abc && \
-	go build -tags $ABC_BUILD ./cmd/abc/...
+	go build -tags $ABC_BUILD ./cmd/abc/... && \
+	mv ./abc /go/bin/ && \
+	rm -rf /go/src && \
+	rm -rf /usr/local/go
+
+WORKDIR /go/bin
 
 # Define default entrypoint
 # Entrypoint gets extra parameters from docker run