diff --git a/6-i386/Makefile b/6-i386/Makefile
index 1e189c5e1f2dc0c4204707ddc573dd6598a616e8..dd66b3fb1471c615f64456deb2aa22da5a984c7b 100644
--- a/6-i386/Makefile
+++ b/6-i386/Makefile
@@ -1,2 +1,2 @@
-IMAGE_SUFFIX := -x86
+VARIANT := x86
 include ../image.mk
diff --git a/6/Makefile b/6/Makefile
index d392171950f81280a5c00a8aa8cfe3672dd5c762..f451fe153997996b75db9be5b1b9b967fad97fc4 100644
--- a/6/Makefile
+++ b/6/Makefile
@@ -1,2 +1,2 @@
-IMAGE_SUFFIX := -x86_64
+VARIANT := x86_64
 include ../image.mk
diff --git a/7/Makefile b/7/Makefile
index d392171950f81280a5c00a8aa8cfe3672dd5c762..f451fe153997996b75db9be5b1b9b967fad97fc4 100644
--- a/7/Makefile
+++ b/7/Makefile
@@ -1,2 +1,2 @@
-IMAGE_SUFFIX := -x86_64
+VARIANT := x86_64
 include ../image.mk
diff --git a/image.mk b/image.mk
index 4e451ff8a281a9253f91597371a2fa5b0971ca18..a6f52bc0ad007b4a87824ee74b43cf3fd01ee7a4 100644
--- a/image.mk
+++ b/image.mk
@@ -2,7 +2,7 @@ OS := centos
 
 IMAGE_PREFIX := ${DOCKER_IMAGE_PREFIX}
 ifeq ($(IMAGE_PREFIX),)
-IMAGE_PREFIX := icinga/
+IMAGE_PREFIX := icinga/$(OS)/
 endif
 
 REGISTRY := ${DOCKER_REGISTRY}
@@ -12,7 +12,7 @@ endif
 
 FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
 VERSION := $(shell basename `pwd`)
-IMAGE := $(IMAGE_PREFIX)$(OS)-$(VERSION)$(IMAGE_SUFFIX)
+IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
 
 all: pull build