diff --git a/fleetconfig-controller/Makefile b/fleetconfig-controller/Makefile
index cb657f73..e1cead16 100644
--- a/fleetconfig-controller/Makefile
+++ b/fleetconfig-controller/Makefile
@@ -23,9 +23,13 @@ $(foreach flavour,$(IMAGE_FLAVOURS),\
 	$(eval VARIANT := $(word 1,$(subst :, ,$(flavour)))) \
 	$(eval VARIANT_TAG := $(if $(filter base,$(VARIANT)),$(IMAGE_TAG),$(IMAGE_TAG)-$(VARIANT))) \
 	$(eval DOCKERFILE := $(word 2,$(subst :, ,$(flavour)))) \
-	$(eval $(call build-image,$(IMAGE_REPO),$(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG),$(DOCKERFILE),.)) \
+	$(eval $(call build-image,$(IMAGE_REPO)-$(VARIANT),$(IMAGE_REGISTRY)/$(IMAGE_REPO):$(VARIANT_TAG),$(DOCKERFILE),.)) \
 )
 
+# Create a single images target that builds all variants
+.PHONY: images
+images: $(foreach flavour,$(IMAGE_FLAVOURS),image-$(IMAGE_REPO)-$(word 1,$(subst :, ,$(flavour))))
+
 .PHONY: image-push
 image-push:
 	$(foreach flavour,$(IMAGE_FLAVOURS),\