diff --git a/6-i386/Makefile b/6-i386/Makefile
index dd66b3fb1471c615f64456deb2aa22da5a984c7b..4082e81477ad935d1169c90f0e1a83b2a3f1cd2a 100644
--- a/6-i386/Makefile
+++ b/6-i386/Makefile
@@ -1,2 +1,3 @@
+VERSION := 6
 VARIANT := x86
 include ../image.mk
diff --git a/image.mk b/image.mk
index c662dd3094cf2bde764926b958ea963d943a81ff..8d05a70e27f18ff46bcde9b9960c5e7d1740bf65 100644
--- a/image.mk
+++ b/image.mk
@@ -11,7 +11,9 @@ IMAGE_PREFIX := $(REGISTRY)/$(IMAGE_PREFIX)
 endif
 
 FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
+ifeq ($(VERSION),)
 VERSION := $(shell basename `pwd`)
+endif
 IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
 
 all: pull build