diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run
index 7e4ba737fd..7cb13d5ba8 100644
--- a/repos/libports/run/qt5.run
+++ b/repos/libports/run/qt5.run
@@ -5,24 +5,16 @@ import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_launchpad \
                   [depot_user]/src/qt5_tetrix
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="qt_launchpad" caps="600">
 		<resource name="RAM" quantum="80M"/>
 		<config>
@@ -85,14 +77,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run
index 74c96cdac3..3d1bb097dd 100644
--- a/repos/libports/run/qt5_calculatorform.run
+++ b/repos/libports/run/qt5_calculatorform.run
@@ -3,24 +3,16 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 import_from_depot [depot_user]/src/qt5_calculatorform \
                   [depot_user]/src/qt5_component
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="calculatorform" caps="200">
 		<resource name="RAM" quantum="80M"/>
 		<config>
@@ -49,14 +41,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_common.inc b/repos/libports/run/qt5_common.inc
index 09be0f86c5..d0324cc472 100644
--- a/repos/libports/run/qt5_common.inc
+++ b/repos/libports/run/qt5_common.inc
@@ -323,7 +323,7 @@ proc qt5_start_nodes { } {
 
 proc qt5_boot_modules { } {
 
-	set boot_modules { }
+	set boot_modules [build_artifacts]
 
 	lappend boot_modules [language_chargen].chargen
 	lappend boot_modules special.chargen
diff --git a/repos/libports/run/qt5_core.run b/repos/libports/run/qt5_core.run
index 8996fe1806..70dafcca23 100644
--- a/repos/libports/run/qt5_core.run
+++ b/repos/libports/run/qt5_core.run
@@ -45,7 +45,7 @@ install_config {
 	</start>
 </config>}
 
-build_boot_image { }
+build_boot_image [build_artifacts]
 
 append qemu_args " -nographic "
 
diff --git a/repos/libports/run/qt5_core_cmake.run b/repos/libports/run/qt5_core_cmake.run
index 8d66fb09ef..1471406473 100644
--- a/repos/libports/run/qt5_core_cmake.run
+++ b/repos/libports/run/qt5_core_cmake.run
@@ -45,7 +45,7 @@ install_config {
 	</start>
 </config>}
 
-build_boot_image { }
+build_boot_image [build_artifacts]
 
 append qemu_args " -nographic "
 
diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run
index 157727bf57..c01820a5b1 100644
--- a/repos/libports/run/qt5_openglwindow.run
+++ b/repos/libports/run/qt5_openglwindow.run
@@ -3,24 +3,16 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_openglwindow
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="openglwindow" caps="250">
 		<resource name="RAM" quantum="80M"/>
 		<route>
@@ -49,14 +41,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run
index 2c92281446..df80c1702d 100644
--- a/repos/libports/run/qt5_qpluginwidget.run
+++ b/repos/libports/run/qt5_qpluginwidget.run
@@ -6,36 +6,18 @@ import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/test-qpluginwidget \
                   [depot_user]/src/zlib
 
-#
-# Build
-#
+build { server/loader server/tar_rom test/nitpicker }
 
-append build_components {
-	server/loader
-	server/tar_rom
-	test/nitpicker
-}
-
-build $build_components
-
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="loader" caps="100">
 		<resource name="RAM" quantum="8M"/>
 		<provides><service name="Loader"/></provides>
@@ -87,20 +69,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-append boot_modules {
-	loader
-	tar_rom
-	testnit
-}
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run
index 503a13c79b..cfb2269a59 100644
--- a/repos/libports/run/qt5_quicktest.run
+++ b/repos/libports/run/qt5_quicktest.run
@@ -4,24 +4,16 @@ import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_declarative \
                   [depot_user]/src/test-qt_quick
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="test-qt_quick" caps="250">
 		<resource name="RAM" quantum="80M"/>
 		<config>
@@ -51,14 +43,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run
index a3e8e81722..389201069e 100644
--- a/repos/libports/run/qt5_samegame.run
+++ b/repos/libports/run/qt5_samegame.run
@@ -5,24 +5,16 @@ import_from_depot [depot_user]/raw/qt5_samegame \
                   [depot_user]/src/qt5_declarative \
                   [depot_user]/src/qt5_samegame
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="samegame" caps="350">
 		<resource name="RAM" quantum="128M"/>
 		<config>
@@ -54,14 +46,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_testqstring.run b/repos/libports/run/qt5_testqstring.run
index 445659988a..f4c7120090 100644
--- a/repos/libports/run/qt5_testqstring.run
+++ b/repos/libports/run/qt5_testqstring.run
@@ -3,24 +3,16 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_testqstring
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="tutorial1" caps="200">
 		<resource name="RAM" quantum="80M"/>
 		<config>
@@ -49,14 +41,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until " Finished testing of TestQString" 30
diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run
index e778a5887b..c7c0bd9dbc 100644
--- a/repos/libports/run/qt5_tetrix.run
+++ b/repos/libports/run/qt5_tetrix.run
@@ -3,24 +3,16 @@ source ${genode_dir}/repos/libports/run/qt5_common.inc
 import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_tetrix
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="tetrix" caps="200">
 		<resource name="RAM" quantum="80M"/>
 		<config>
@@ -49,14 +41,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run
index 2f56e7d096..758d7d5d72 100644
--- a/repos/libports/run/qt5_textedit.run
+++ b/repos/libports/run/qt5_textedit.run
@@ -4,26 +4,16 @@ import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_textedit \
                   [depot_user]/src/vfs
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-
-append config [qt5_parent_provides]
-
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="100"/>
 	<default-route>
 		<any-service> <parent/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="ram_fs">
 		<resource name="RAM" quantum="10M"/>
 		<binary name="vfs"/>
@@ -34,9 +24,7 @@ append config {
 			<policy label_prefix="textedit" root="/" writeable="yes" />
 			<policy label_prefix="textedit2" root="/" writeable="yes" />
 		</config>
-	</start>}
-
-append config {
+	</start>
 	<start name="textedit" caps="300">
 		<resource name="RAM" quantum="70M"/>
 		<config>
@@ -89,14 +77,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever
diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run
index 53018d533d..b6a5a74ce6 100644
--- a/repos/libports/run/qt5_virtualkeyboard.run
+++ b/repos/libports/run/qt5_virtualkeyboard.run
@@ -7,24 +7,16 @@ import_from_depot [depot_user]/src/qt5_component \
                   [depot_user]/src/qt5_virtualkeyboard \
                   [depot_user]/src/qt5_virtualkeyboard_example
 
-#
-# Generate config
-#
-
-append config {
+install_config {
 <config>
-	<parent-provides>}
-append config [qt5_parent_provides]
-append config {
+	<parent-provides>
+		} [qt5_parent_provides] {
 	</parent-provides>
 	<default caps="300"/>
 	<default-route>
 		<any-service> <parent/> <child name="wm"/> <any-child/> </any-service>
-	</default-route>}
-
-append config [qt5_start_nodes]
-
-append config {
+	</default-route>
+	} [qt5_start_nodes] {
 	<start name="basic" caps="450">
 		<resource name="RAM" quantum="100M"/>
 		<config>
@@ -58,14 +50,6 @@ append config {
 </config>
 }
 
-install_config $config
-
-#
-# Boot modules
-#
-
-append boot_modules [qt5_boot_modules]
-
-build_boot_image $boot_modules
+build_boot_image [qt5_boot_modules]
 
 run_genode_until forever