diff --git a/Makefile b/Makefile
index e59f239..bef4b70 100644
--- a/Makefile
+++ b/Makefile
@@ -30,7 +30,7 @@ tag: generate
 	done
 
 login:
-	@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)"
+	@docker login -u "$(DOCKER_USER)" -p "$(DOCKER_PASS)" "$(PROXY)"
 
 push: login
 	for version in $(VERSIONS); do \
diff --git a/templates/Makefile b/templates/Makefile
index d9ca941..8f0925d 100644
--- a/templates/Makefile
+++ b/templates/Makefile
@@ -1,7 +1,7 @@
 OWNER=agoda
 IMAGE_NAME=docker-emulator-{{ platform }}
 VCS_REF=`git rev-parse --short HEAD`
-IMAGE_VERSION=1.0.$(TRAVIS_BUILD_NUMBER)
+IMAGE_VERSION ?= 1.0.0
 PROXY ?=
 QNAME=$(PROXY)$(OWNER)/$(IMAGE_NAME)