diff --git a/Makefile b/Makefile
index c8ab4bfefc5..eac269631c0 100644
--- a/Makefile
+++ b/Makefile
@@ -34,9 +34,13 @@ VERSION ?= latest
 # Use a custom version for E2E tests if we are testing in CI
 ifdef CI
 ifndef PUBLISH
+ifdef TEST_WINDOWS
+override IMAGE_VERSION := e2e-win-$(GIT_COMMIT)
+else
 override IMAGE_VERSION := e2e-$(GIT_COMMIT)
 endif
 endif
+endif
 IMAGE_TAG = $(REGISTRY)/$(IMAGENAME):$(IMAGE_VERSION)
 IMAGE_TAG_LATEST = $(REGISTRY)/$(IMAGENAME):latest
 ifndef BUILD_DATE