diff --git a/build.sbt b/build.sbt
index b78da0a68..c9bf62b80 100644
--- a/build.sbt
+++ b/build.sbt
@@ -180,19 +180,21 @@ def mimaSettingsSince(versions: Seq[String]): Seq[Def.Setting[_]] = Def settings
 val scriptedSbtReduxMimaSettings = Def.settings(mimaPreviousArtifacts := Set())
 
 lazy val sbtRoot: Project = (project in file("."))
-// .aggregate(nonRoots: _*)
-  .aggregate(
-    collectionProj,
-    coreMacrosProj,
-    utilLogging,
-    utilControl,
-    completeProj,
-    logicProj,
-    utilCache,
-    taskProj,
-    stdTaskProj,
-    testingProj,
-  )
+  .aggregate((allProjects diff Seq(
+    actionsProj,
+    commandProj,
+    mainSettingsProj,
+    zincLmIntegrationProj,
+    protocolProj,
+    scriptedSbtReduxProj,
+    scriptedSbtOldProj,
+    scriptedPluginProj,
+    dependencyTreeProj,
+    mainProj,
+    sbtProj,
+    bundledLauncherProj,
+    sbtClientProj,
+  )).map(p => LocalProject(p.id)): _*)
   .settings(
     minimalSettings,
     onLoadMessage := {
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
index f5a673be4..6564bc319 100644
--- a/project/Dependencies.scala
+++ b/project/Dependencies.scala
@@ -56,7 +56,11 @@ object Dependencies {
       moduleId: ModuleID,
       c: Option[Configuration] = None
   ) = (p: Project) => {
-    val m = moduleId.withConfigurations(c.map(_.name)).cross(CrossVersion.for3Use2_13)
+    val m0 = moduleId.withConfigurations(c.map(_.name))
+    val m = m0.name match {
+      case "compiler-interface" => m0
+      case _ => m0.cross(CrossVersion.for3Use2_13)
+    }
     path match {
       case Some(f) =>
         p.dependsOn(ClasspathDependency(ProjectRef(file(f), projectName), c.map(_.name)))