diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 000000000..f4b11987f
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,2 @@
+.git
+.github
diff --git a/Makefile b/Makefile
index 5ad71d63c..c2137af53 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,9 @@ LDFLAGS := $(shell go run buildscripts/gen-ldflags.go)
 GOARCH := $(shell go env GOARCH)
 GOOS := $(shell go env GOOS)
 
-TAG ?= $(USER)
+VERSION ?= $(shell git describe --tags)
+TAG ?= "minio/minio:$(VERSION)"
+
 BUILD_LDFLAGS := '$(LDFLAGS)'
 
 all: build