diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index a32ef62dc0..916a64cfeb 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -11,6 +11,25 @@
 #			directory paths and the like.
 
 
+#pragma mark - container settings
+
+# Haiku image
+HAIKU_IMAGE_CONTAINER_NAME = haiku-image-container ;
+HAIKU_CONTAINER_GRIST on $(HAIKU_IMAGE_CONTAINER_NAME) = HaikuImage ;
+HAIKU_INCLUDE_IN_CONTAINER_VAR on $(HAIKU_IMAGE_CONTAINER_NAME)
+	= HAIKU_INCLUDE_IN_IMAGE ;
+HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_IMAGE_CONTAINER_NAME)
+	= HAIKU_IMAGE_INSTALL_TARGETS ;
+
+# network boot archive
+HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME = haiku-netboot-archive-container ;
+HAIKU_CONTAINER_GRIST on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
+	= NetBootArchive ;
+# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
+HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
+	= HAIKU_NET_BOOT_ARCHIVE_INSTALL_TARGETS ;
+
+
 # analyze an optionally replace jam's target parameters
 HAIKU_ORIGINAL_JAM_TARGETS = $(JAM_TARGETS) ;
 if $(JAM_TARGETS) {
@@ -724,25 +743,6 @@ if $(TARGET_PLATFORM) = libbe_test {
 }
 
 
-#pragma mark - container settings
-
-# Haiku image
-HAIKU_IMAGE_CONTAINER_NAME = haiku-image-container ;
-HAIKU_CONTAINER_GRIST on $(HAIKU_IMAGE_CONTAINER_NAME) = HaikuImage ;
-HAIKU_INCLUDE_IN_CONTAINER_VAR on $(HAIKU_IMAGE_CONTAINER_NAME)
-	= HAIKU_INCLUDE_IN_IMAGE ;
-HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_IMAGE_CONTAINER_NAME)
-	= HAIKU_IMAGE_INSTALL_TARGETS ;
-
-# network boot archive
-HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME = haiku-netboot-archive-container ;
-HAIKU_CONTAINER_GRIST on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
-	= NetBootArchive ;
-# HAIKU_INCLUDE_IN_CONTAINER_VAR -- update only mode not supported
-HAIKU_INSTALL_TARGETS_VAR on $(HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME)
-	= HAIKU_NET_BOOT_ARCHIVE_INSTALL_TARGETS ;
-
-
 #pragma mark -
 
 # common stuff
diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage
index ebb1f9282b..23574da961 100644
--- a/build/jam/HaikuImage
+++ b/build/jam/HaikuImage
@@ -415,7 +415,7 @@ AddVariableToScript $(script) : installDir : $(HAIKU_INSTALL_DIR) ;
 AddVariableToScript $(script) : imageSize : $(HAIKU_IMAGE_SIZE) ;
 AddVariableToScript $(script) : addBuildCompatibilityLibDir
 	: $(HOST_ADD_BUILD_COMPATIBILITY_LIB_DIR) ;
-AddVariableToScript $(script) : updateOnly : $(HAIKU_IMAGE_UPDATE_ONLY) ;
+AddVariableToScript $(script) : updateOnly : [ IsUpdateHaikuImageOnly ] ;
 AddTargetVariableToScript $(script) : <build>bfs_shell : bfsShell ;
 AddTargetVariableToScript $(script) : <build>fs_shell_command : fsShellCommand ;
 AddTargetVariableToScript $(script) : <build>copyattr ;
diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 0e4d89142e..b4e32618a5 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -413,6 +413,11 @@ rule SetUpdateHaikuImageOnly flag
 	HAIKU_CONTAINER_UPDATE_ONLY on $(HAIKU_IMAGE_CONTAINER_NAME) = $(flag) ;
 }
 
+rule IsUpdateHaikuImageOnly
+{
+	on $(HAIKU_IMAGE_CONTAINER_NAME) return $(HAIKU_CONTAINER_UPDATE_ONLY) ;
+}
+
 rule AddDirectoryToHaikuImage directoryTokens
 {
 	# AddDirectoryToHaikuImage <directoryTokens>