diff --git a/Makefile b/Makefile
index 615b2fe3c..0189391c6 100644
--- a/Makefile
+++ b/Makefile
@@ -159,7 +159,10 @@ ARTIFACTS ?= $(ROOT_DIR)/_artifacts
 E2E_CONF_FILE ?= $(ROOT_DIR)/test/e2e/config/e2e_conf.yaml
 E2E_OUT_DIR ?= $(ROOT_DIR)/test/e2e/_out
 E2E_CONF_FILE_ENVSUBST ?= $(E2E_OUT_DIR)/$(notdir $(E2E_CONF_FILE))
-E2E_CONTAINERS ?= quay.io/metal3-io/cluster-api-provider-metal3 quay.io/metal3-io/baremetal-operator quay.io/metal3-io/ip-address-manager
+CAPM3_IMAGE ?= ${CONTAINER_REGISTRY}/metal3-io/cluster-api-provider-metal3:${CAPM3RELEASE:-latest}
+IPAM_IMAGE ?= ${CONTAINER_REGISTRY}/metal3-io/ip-address-manager:${IPAMRELEASE:-latest}
+BMO_IMAGE ?= ${CONTAINER_REGISTRY}/metal3-io/baremetal-operator:${BARE_METAL_OPERATOR_TAG:-latest}
+E2E_CONTAINERS ?= $(CAPM3_IMAGE) $(IPAM_IMAGE) $(BMO_IMAGE)
 
 SKIP_CLEANUP ?= false
 EPHEMERAL_TEST ?= false