diff --git a/repos/libports/run/nic_router.inc b/repos/libports/run/nic_router.inc
index 75a0161c9c..ef25da29e3 100644
--- a/repos/libports/run/nic_router.inc
+++ b/repos/libports/run/nic_router.inc
@@ -3,9 +3,11 @@ if {[get_cmd_switch --autopilot] && [have_board virt_qemu_riscv]} {
 	exit 0
 }
 
-set targets "core init timer server/nic_router server/nic_bridge
-             test/lwip/http_srv test/lwip/http_clnt test/lwip/udp
-             server/nic_loopback lib/vfs_lwip "
+set targets {
+	core lib/ld init timer lib/libc lib/vfs lib/vfs_lwip
+	server/report_rom server/nic_router server/nic_bridge server/nic_loopback
+	test/lwip/http_srv test/lwip/http_clnt test/lwip/udp
+}
 
 proc client_bin { prot } {
 	if {$prot == "udp"}  { return "test-lwip-udp-client" }
@@ -70,9 +72,4 @@ proc server_config { name prot ip_addr gateway netmask nic port } {
 	return $result
 }
 
-set boot_modules "
-	core init timer nic_router nic_bridge nic_loopback ld.lib.so
-	libc.lib.so vfs.lib.so vfs_lwip.lib.so [client_bin udp] [server_bin udp]
-	[client_bin http] [server_bin http] "
-
 append qemu_args "-nographic "
diff --git a/repos/libports/run/nic_router.run b/repos/libports/run/nic_router.run
index 5badf25ddc..9436db9ba0 100644
--- a/repos/libports/run/nic_router.run
+++ b/repos/libports/run/nic_router.run
@@ -21,8 +21,6 @@ proc enable_test_7 { } { return 1 }
 
 source ${genode_dir}/repos/libports/run/nic_router.inc
 
-lappend targets server/report_rom
-
 build $targets
 
 create_boot_directory
@@ -378,9 +376,7 @@ append config {
 
 install_config $config
 
-lappend boot_modules report_rom
-
-build_boot_image $boot_modules
+build_boot_image [build_artifacts]
 
 for {set i 0} {$i < $nr_of_clients} {incr i 1} {
 	append done_string {.*Test done.*\n}
diff --git a/repos/libports/run/nic_router_dyn_config.run b/repos/libports/run/nic_router_dyn_config.run
index 70207c0d14..ca74448bbd 100644
--- a/repos/libports/run/nic_router_dyn_config.run
+++ b/repos/libports/run/nic_router_dyn_config.run
@@ -12,7 +12,6 @@ proc enable_test_7 { } { return 0 }
 
 source ${genode_dir}/repos/libports/run/nic_router.inc
 
-lappend targets server/report_rom
 lappend targets server/dynamic_rom
 
 build $targets
@@ -423,10 +422,7 @@ append config {
 
 install_config $config
 
-lappend boot_modules report_rom
-lappend boot_modules dynamic_rom
-
-build_boot_image $boot_modules
+build_boot_image [build_artifacts]
 
 for {set i 0} {$i < $nr_of_clients} {incr i 1} {
 	append done_string {.*Test done.*\n}
diff --git a/repos/libports/run/nic_router_ipv4_fragm.run b/repos/libports/run/nic_router_ipv4_fragm.run
index e09b9392fd..d3a6b5becf 100644
--- a/repos/libports/run/nic_router_ipv4_fragm.run
+++ b/repos/libports/run/nic_router_ipv4_fragm.run
@@ -46,11 +46,11 @@ create_boot_directory
 import_from_depot [depot_user]/pkg/[drivers_nic_pkg]
 
 build {
-	core init timer server/nic_router app/ping test/lwip/udp
-	server/report_rom }
-
-append config {
+	core lib/ld init timer lib/libc lib/libm lib/vfs lib/vfs_lwip
+	server/nic_router app/ping test/lwip/udp server/report_rom
+}
 
+install_config {
 <config>
 
 	<parent-provides>
@@ -144,10 +144,7 @@ append config {
 
 </config> }
 
-install_config $config
-build_boot_image {
-	core init timer nic_router ping test-lwip-udp-server ld.lib.so libc.lib.so
-	libm.lib.so vfs.lib.so vfs_lwip.lib.so report_rom }
+build_boot_image [build_artifacts]
 
 # wait for server ip stack to come up
 run_genode_until {.*lwIP Nic interface up.*\n} 30