diff --git a/Makefile b/Makefile
index 6ed364837dde43b09f8845a250254b9a3c3ae01b..5abd108bea18323274a168653eb8492f9028fe7c 100644
--- a/Makefile
+++ b/Makefile
@@ -110,7 +110,11 @@ endef
 
 ISO_IMAGE_DEST=/iso
 ISO_IMAGE=$(ISO_IMAGE_DEST)/image.iso
-ISO_URL=$(ISO_BASE_URL)/$(ISO_RELEASE)/$(ISO_CHANNEL)
+ifneq (,$(findstring url-no-release,$(ISO_PATTERN_FLAGS)))
+  ISO_URL=$(ISO_BASE_URL)/$(ISO_CHANNEL)
+else
+  ISO_URL=$(ISO_BASE_URL)/$(ISO_RELEASE)/$(ISO_CHANNEL)
+endif
 ISO_CONTENT=$(ISO_IMAGE_DEST)/content
 
 IMAGE_PART_FILE=$(WORKSPACE)/image.img.part