diff --git a/releng/org.eclipse.passage.releng/passage.setup b/releng/org.eclipse.passage.releng/passage.setup
index d5c35332c..e1ac2697d 100644
--- a/releng/org.eclipse.passage.releng/passage.setup
+++ b/releng/org.eclipse.passage.releng/passage.setup
@@ -92,12 +92,6 @@
         name="JRE for JavaSE-17">
       <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
     </setupTask>
-    <setupTask
-        xsi:type="pde:APIBaselineFromTargetTask"
-        name="Modular API Baseline"
-        targetName="org.eclipse.passage.baseline">
-      <description>An API baseline based on the target platform named 'Modular API Baseline Target'</description>
-    </setupTask>
     <setupTask
         xsi:type="git:GitCloneTask"
         id="git.clone.passage"
@@ -117,15 +111,26 @@
           <value>remoteURI</value>
         </detail>
       </annotation>
+      <configSections
+          name="branch">
+        <properties
+            key="autoSetupRebase"
+            value="always"/>
+      </configSections>
       <description>${scope.project.label} GitHub</description>
     </setupTask>
     <setupTask
         xsi:type="pde:TargetPlatformTask"
         name="org.eclipse.passage.target"/>
+    <setupTask
+        xsi:type="pde:APIBaselineFromTargetTask"
+        name="Passage API Baseline"
+        targetName="org.eclipse.passage.baseline"/>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator
-          rootFolder="${git.clone.passage.location}"/>
+          rootFolder="${git.clone.passage.location}"
+          locateNestedProjects="true"/>
     </setupTask>
     <setupTask
         xsi:type="setup.workingsets:WorkingSetTask">