diff --git a/Makefile b/Makefile
index 0a3a1e493..120d97b3f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
 REPO?=kubespheredev/ks-installer
-TAG:=$(shell git rev-parse --abbrev-ref HEAD | sed -e 's/\//-/g')-dev
+TAG:=$(shell git rev-parse --abbrev-ref HEAD | sed -e 's/\//-/g')-dev-$(shell git rev-parse --short HEAD)
+CONTAINER_CLI?=docker
 
 build:
-	docker build . --file Dockerfile --tag $(REPO):$(TAG)
+	$(CONTAINER_CLI) build . --file Dockerfile --tag $(REPO):$(TAG)
 push:
-	docker push $(REPO):$(TAG)
+	$(CONTAINER_CLI) push $(REPO):$(TAG)
 all: build push