diff --git a/pkg/platform/runtime/setup/setup.go b/pkg/platform/runtime/setup/setup.go
index 5a473c2a3d..6da4b173bc 100644
--- a/pkg/platform/runtime/setup/setup.go
+++ b/pkg/platform/runtime/setup/setup.go
@@ -521,9 +521,14 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
 				artifactsToInstall = append(artifactsToInstall, a.ArtifactID)
 			}
 		}
-		artifactsToBuild, err = artifactListing.BuildtimeClosure()
-	} else {
 		artifactsToBuild, err = artifactListing.RuntimeClosure()
+	} else {
+		for _, a := range requestedArtifacts {
+			if _, alreadyInstalled := alreadyInstalled[a.ArtifactID]; !alreadyInstalled {
+				artifactsToInstall = append(artifactsToInstall, a.ArtifactID)
+			}
+		}
+		artifactsToBuild, err = artifactListing.BuildtimeClosure()
 	}
 	if err != nil {
 		return nil, nil, errs.Wrap(err, "Failed to compute artifacts to build")
@@ -587,7 +592,9 @@ func (s *Setup) fetchAndInstallArtifactsFromBuildPlan(installFunc artifactInstal
 		//}
 	}
 
-	return buildResult.OrderedArtifacts(), uninstallArtifacts, nil
+	artifacts := buildResult.OrderedArtifacts()
+	logging.Debug("Returning artifacts: %v", artifacts)
+	return artifacts, uninstallArtifacts, nil
 }
 
 func aggregateErrors() (chan<- error, <-chan error) {
diff --git a/version.txt b/version.txt
index f0938929d6..29f03fbb86 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.42.0-RC1
\ No newline at end of file
+0.42.0-RC2
\ No newline at end of file