diff --git a/.gitignore b/.gitignore
index 54c6516..470effd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 HELP.md
 flyway.conf
 .gradle
+.*
 /build/
 !gradle/wrapper/gradle-wrapper.jar
 
diff --git a/Makefile b/Makefile
index ffe6866..0793a4c 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,9 @@
 DISTANCE=$(shell echo $(VERSION) | awk -F'-' '{print $$2}')
 HASH=$(shell echo $(VERSION) | awk -F'-' '{print $$3}')
 
-ifneq ($(DISTANCE), 0)
+ifeq ($(DISTANCE),)
+IMAGE_VERSION=$(TAG)
+else ifneq ($(DISTANCE), 0)
 IMAGE_VERSION=dev
 else
 IMAGE_VERSION=$(TAG)