diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup
index f07fb103a8..ed496222ce 100644
--- a/build/jam/BuildSetup
+++ b/build/jam/BuildSetup
@@ -25,7 +25,8 @@ 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 ;
-HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_IMAGE_CONTAINER_NAME) = system ;
+HAIKU_CONTAINER_SYSTEM_DIR_TOKENS on $(HAIKU_IMAGE_CONTAINER_NAME)
+	= system non-packaged ;
 
 # network boot archive
 HAIKU_NET_BOOT_ARCHIVE_CONTAINER_NAME = haiku-netboot-archive-container ;