diff --git a/releng/CDT.setup b/releng/CDT.setup
index f259fd1673f..665833ff6af 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -67,8 +67,8 @@
   </setupTask>
   <setupTask
       xsi:type="jdt:JRETask"
-      version="JavaSE-17"
-      location="${jre.location-17}">
+      version="JavaSE-21"
+      location="${jre.location-21}">
     <description>Define the JRE needed to compile and run the Java projects of ${scope.project.label}</description>
   </setupTask>
   <setupTask
@@ -186,15 +186,49 @@
       </detail>
       <detail
           key="label">
-        <value>CDT Github Repository</value>
+        <value>CDT GitHub Repository</value>
       </detail>
       <detail
           key="target">
         <value>remoteURI</value>
       </detail>
     </annotation>
+    <configSections
+        name="branch">
+      <properties
+          key="autoSetupRebase"
+          value="always"/>
+    </configSections>
     <description>CDT</description>
   </setupTask>
+  <setupTask
+      xsi:type="git:GitCloneTask"
+      id="github.clone.cdt-lsp"
+      remoteURI="eclipse-cdt/cdt-lsp"
+      checkoutBranch="master">
+    <annotation
+        source="http://www.eclipse.org/oomph/setup/InducedChoices">
+      <detail
+          key="inherit">
+        <value>github.remoteURIs</value>
+      </detail>
+      <detail
+          key="label">
+        <value>CDT LSP GitHub Repository</value>
+      </detail>
+      <detail
+          key="target">
+        <value>remoteURI</value>
+      </detail>
+    </annotation>
+    <configSections
+        name="branch">
+      <properties
+          key="autoSetupRebase"
+          value="always"/>
+    </configSections>
+    <description>CDT LSP</description>
+  </setupTask>
   <setupTask
       xsi:type="setup.targlets:TargletTask"
       programArguments="-consolelog"
@@ -229,6 +263,9 @@
       <sourceLocator
           rootFolder="${github.clone.cdt.location}"
           locateNestedProjects="true"/>
+      <sourceLocator
+          rootFolder="${github.clone.cdt-lsp.location}"
+          locateNestedProjects="true"/>
       <repositoryList>
         <repository
             url="https://download.eclipse.org/cbi/updates/license"/>
@@ -368,6 +405,12 @@
           project="org.eclipse.cdt"
           relativePathPattern="llvm/.*"/>
     </workingSet>
+    <workingSet
+        name="CDT LSP">
+      <predicate
+          xsi:type="predicates:RepositoryPredicate"
+          project="org.eclipse.cdt.lsp"/>
+    </workingSet>
     <workingSet
         name="CDT Memory">
       <predicate