diff --git a/build/jam/ImageRules b/build/jam/ImageRules
index 34f90ae832..7e27bc54e5 100644
--- a/build/jam/ImageRules
+++ b/build/jam/ImageRules
@@ -160,6 +160,8 @@ rule AddFilesToContainer container : directoryTokens : targets : destName
 		: $(directoryTokens) ] ;
 	local containerGrist = [ on $(container) return $(HAIKU_CONTAINER_GRIST) ] ;
 
+	targets = [ FFilterByBuildFeatures $(targets) ] ;
+
 	# If the image shall only be updated, we filter out all targets not marked
 	# accordingly.
 	if [ on $(container) return $(HAIKU_CONTAINER_UPDATE_ONLY) ]
@@ -303,6 +305,8 @@ rule AddDriversToContainer container : relativeDirectoryTokens : targets
 	local directoryTokens = system add-ons kernel drivers dev
 		$(relativeDirectoryTokens) ;
 
+	targets = [ FFilterByBuildFeatures $(targets) ] ;
+
 	AddFilesToContainer $(container) : system add-ons kernel drivers bin
 		: $(targets) ;
 
@@ -335,6 +339,8 @@ rule AddNewDriversToContainer container : relativeDirectoryTokens
 	local directoryTokens = system add-ons kernel drivers
 		$(relativeDirectoryTokens) ;
 
+	targets = [ FFilterByBuildFeatures $(targets) ] ;
+
 	AddFilesToContainer $(container) : $(directoryTokens)
 		: $(targets) ;
 }
@@ -350,6 +356,8 @@ rule AddBootModuleSymlinksToContainer container : targets
 		return ;
 	}
 
+	targets = [ FFilterByBuildFeatures $(targets) ] ;
+
 	# add the symlinks
 	local installTargetsVar
 		= [ on $(container) return $(HAIKU_INSTALL_TARGETS_VAR) ] ;
@@ -1272,6 +1280,8 @@ rule AddLibrariesToHaikuHybridImage directory : libs
 	# Installs libraries with the appropriate links onto the image.
 	#
 
+	libs = [ FFilterByBuildFeatures $(libs) ] ;
+
 	local lib ;
 	for lib in $(libs) {
 		local abiVersion = [ on $(lib) return $(HAIKU_LIB_ABI_VERSION) ] ;