diff --git a/releng/CDT.setup b/releng/CDT.setup
index 66b84e160c0..94d9cce432d 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -153,28 +153,6 @@
         version="0.0.0">
       <description>An API baseline based on the target platform named 'Modular API Baseline Target'</description>
     </setupTask>
-    <setupTask
-        xsi:type="git:GitCloneTask"
-        id="git.clone.cdt"
-        remoteURI="cdt/org.eclipse.cdt"
-        checkoutBranch="master">
-      <annotation
-          source="http://www.eclipse.org/oomph/setup/InducedChoices">
-        <detail
-            key="inherit">
-          <value>eclipse.git.gerrit.remoteURIs</value>
-        </detail>
-        <detail
-            key="label">
-          <value>${scope.project.label} Git or Gerrit Repository</value>
-        </detail>
-        <detail
-            key="target">
-          <value>remoteURI</value>
-        </detail>
-      </annotation>
-      <description>CDT</description>
-    </setupTask>
     <setupTask
         xsi:type="setup.targlets:TargletTask"
         programArguments="-consolelog"
@@ -343,6 +321,28 @@
         </repositoryList>
       </targlet>
     </setupTask>
+    <setupTask
+        xsi:type="git:GitCloneTask"
+        id="git.clone.cdt"
+        remoteURI="cdt/org.eclipse.cdt"
+        checkoutBranch="master">
+      <annotation
+          source="http://www.eclipse.org/oomph/setup/InducedChoices">
+        <detail
+            key="inherit">
+          <value>eclipse.git.gerrit.remoteURIs</value>
+        </detail>
+        <detail
+            key="label">
+          <value>${scope.project.label} Git or Gerrit Repository</value>
+        </detail>
+        <detail
+            key="target">
+          <value>remoteURI</value>
+        </detail>
+      </annotation>
+      <description>CDT</description>
+    </setupTask>
     <setupTask
         xsi:type="projects:ProjectsImportTask">
       <sourceLocator