diff --git a/cli/build_bootstrap.php b/cli/build_bootstrap.php
index 30769a4448a0..ccd789e705c6 100755
--- a/cli/build_bootstrap.php
+++ b/cli/build_bootstrap.php
@@ -29,12 +29,14 @@
 
 INFO;
 
-if (isset($argv[1])) {
-    $resolution_file = $argv[1];
-} else {
-    $resolution_file = realpath(__DIR__ . "/../dependency_resolution.php");
+if (count($argv) !== 3) {
+    die("php cli/build_bootstrap.php \$dependency_resolution \$name");
 }
 
+$resolution_file = $argv[1];
+$name = $argv[2];
+
+
 if (!file_exists($resolution_file)) {
     die("Cannot find resolution file at {$resolution_file}.\n");
 }
@@ -87,4 +89,4 @@
 if (!is_dir(__DIR__ . "/../artifacts")) {
     mkdir(__DIR__ . "/../artifacts", 0755, true);
 }
-file_put_contents(__DIR__ . "/../artifacts/bootstrap.php", $bootstrap);
+file_put_contents(__DIR__ . "/../artifacts/bootstrap_$name.php", $bootstrap);
diff --git a/cli/setup.php b/cli/setup.php
index fbd091b003e0..46cb277eeaab 100755
--- a/cli/setup.php
+++ b/cli/setup.php
@@ -15,7 +15,7 @@
  *
  *********************************************************************/
 
-require_once(__DIR__ . "/../artifacts/bootstrap.php");
+require_once(__DIR__ . "/../artifacts/bootstrap_setup.php");
 require_once(__DIR__ . "/../ilias_version.php");
 
 exit(entry_point("The ILIAS Setup"));
diff --git a/dependency_resolution.php b/components/ILIAS/Setup/resources/dependency_resolution.php
similarity index 100%
rename from dependency_resolution.php
rename to components/ILIAS/Setup/resources/dependency_resolution.php
diff --git a/composer.json b/composer.json
index 115fcc50e2a4..77fc1ad4dbb2 100755
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
 	},
 	"scripts": {
 		"post-autoload-dump": [
-			"@php cli/build_bootstrap.php",
+			"@php cli/build_bootstrap.php components/ILIAS/Setup/resources/dependency_resolution.php setup",
 			"@php cli/setup.php build-artifacts --yes"
 		],
 		"post-install-cmd": [