diff --git a/build/jam/DefaultBuildProfiles b/build/jam/DefaultBuildProfiles
index 1e3d895f84..a8af980eab 100644
--- a/build/jam/DefaultBuildProfiles
+++ b/build/jam/DefaultBuildProfiles
@@ -142,6 +142,7 @@ rule DefineDefaultBuildProfiles
 				HAIKU_IMAGE_SIZE ?= 850 ;
 			}
 			HAIKU_IMAGE_SIZE ?= 600 ;
+			HAIKU_NIGHTLY_BUILD = 1 ;
 
 			AddHaikuImagePackages
 				man
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index f5617c26ae..bcaa5d7fdc 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -1553,7 +1553,12 @@ rule BuildCDBootImage image : bootfloppy : bootefi : extrafiles
 	Depends $(image) : $(bootefi) ;
 	Depends $(image) : $(extrafiles) ;
 	BOOTIMG on $(image) = $(bootfloppy) ;
-	VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
+	
+	if $(HAIKU_NIGHTLY_BUILD) = 1 {
+		VOLID on $(image) = haiku-nightly-$(TARGET_ARCH) ;
+	} else {
+		VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
+	}
 
 	if $(HAIKU_ANYBOOT_LEGACY) = 1 {
 		BuildCDBootImageMBR $(image) : $(bootfloppy) $(extrafiles) ;
@@ -1588,7 +1593,12 @@ rule BuildCDBootPPCImage image : hfsmaps : elfloader : coffloader : chrpscript
 	Depends $(image) : $(extrafiles) ;
 	Depends $(image) : $(hfsmaps) ;
 	MAPS on $(image) = $(hfsmaps) ;
-	VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
+
+	if $(HAIKU_NIGHTLY_BUILD) = 1 {
+		VOLID on $(image) = haiku-nightly-$(TARGET_ARCH) ;
+	} else {
+		VOLID on $(image) = haiku-$(HAIKU_VERSION)-$(TARGET_ARCH) ;
+	}
 
 	BuildCDBootPPCImage1 $(image) : $(elfloader) $(coffloader) $(chrpscript)
 		$(extrafiles) ;