diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 30ea306e1f26623a3209521a8d8bd72f0db1d1e4..1520d46e49072da0ca0292b9d9d5dbe5839f9610 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,12 +6,12 @@ stages:
   - build
 
 variables:
-  DOCKER_REGISTRY: registry.icinga.com
+  DOCKER_REGISTRY: ${CI_REGISTRY}
   DOCKER_IMAGE_PREFIX: ${CI_PROJECT_PATH}/
 
 before_script:
   - docker info
-  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN registry.icinga.com
+  - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN ${CI_REGISTRY}
   - apk -U add make
 
 .build_job: &build_job
diff --git a/image.mk b/image.mk
index 8d05a70e27f18ff46bcde9b9960c5e7d1740bf65..f328a366228697c142e0d48e121fd8dd84652001 100644
--- a/image.mk
+++ b/image.mk
@@ -16,6 +16,12 @@ VERSION := $(shell basename `pwd`)
 endif
 IMAGE := $(IMAGE_PREFIX)$(VERSION):$(VARIANT)
 
+ifeq ($(VARIANT),x86_64)
+IMAGE_EXTRA := $(IMAGE_PREFIX)$(DIST):latest
+else
+IMAGE_EXTRA :=
+endif
+
 all: pull build
 
 pull:
@@ -23,10 +29,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