diff --git a/image.mk b/image.mk
index 632b0cdb5e7959ec725baddd2569461e1751873c..7b82f4ff84488d6fcb268d8efa6dafa5da5a6771 100644
--- a/image.mk
+++ b/image.mk
@@ -14,6 +14,12 @@ FROM := $(shell grep FROM Dockerfile | cut -d" " -f2)
 VERSION := $(shell basename `pwd`)
 IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
 
+ifeq ($(VARIANT),x86_64)
+IMAGE_EXTRA := $(IMAGE_PREFIX)$(DIST):latest
+else
+IMAGE_EXTRA :=
+endif
+
 all: pull build
 
 pull:
@@ -21,10 +27,16 @@ pull:
 	docker pull "$(FROM)"
 
 build:
-	docker build --cache-from "$(IMAGE)" --tag "$(IMAGE)" .
+	docker build --cache-from "${IMAGE}" --tag "$(IMAGE)" .
+ifneq ($(IMAGE_EXTRA),)
+	docker tag "$(IMAGE)" "$(IMAGE_EXTRA)"
+endif
 
 push:
 	docker push "$(IMAGE)"
+ifneq ($(IMAGE_EXTRA),)
+	docker push "$(IMAGE_EXTRA)"
+endif
 
 clean:
 	if (docker inspect --type image "$(IMAGE)" >/dev/null 2>&1); then docker rmi "$(IMAGE)"; fi