diff --git a/releng/CDT.setup b/releng/CDT.setup
index fe11947ccbe..bfcf32da485 100644
--- a/releng/CDT.setup
+++ b/releng/CDT.setup
@@ -221,6 +221,8 @@
           name="org.eclipse.test.feature.group"/>
       <requirement
           name="org.eclipse.tm4e.feature.feature.group"/>
+      <requirement
+          name="org.eclipse.tm4e.language_pack.feature.feature.group"/>
       <requirement
           name="*"/>
       <sourceLocator
@@ -234,11 +236,11 @@
         <repository
             url="https://download.eclipse.org/linuxtools/updates-docker-nightly"/>
         <repository
-            url="https://download.eclipse.org/lsp4e/releases/latest"/>
+            url="https://download.eclipse.org/lsp4e/snapshots"/>
         <repository
             url="https://download.eclipse.org/modeling/emf/emf/builds/nightly/latest"/>
         <repository
-            url="https://download.eclipse.org/tm4e/releases/latest"/>
+            url="https://download.eclipse.org/tm4e/snapshots"/>
         <repository
             url="https://download.eclipse.org/tools/cdt/releases/latest"/>
         <repository
diff --git a/releng/org.eclipse.cdt.target/cdt.target b/releng/org.eclipse.cdt.target/cdt.target
index 0c21514ff10..2e071443793 100644
--- a/releng/org.eclipse.cdt.target/cdt.target
+++ b/releng/org.eclipse.cdt.target/cdt.target
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <?pde version="3.8"?>
-<target name="cdt" sequenceNumber="130">
+<target name="cdt" sequenceNumber="131">
 	<locations>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/cbi/updates/license/"/>
@@ -23,7 +23,7 @@
 			<unit id="org.eclipse.linuxtools.docker.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/lsp4e/releases/latest/"/>
+			<repository location="https://download.eclipse.org/lsp4e/snapshots/"/>
 			<unit id="org.eclipse.lsp4e" version="0.0.0"/>
 			<unit id="org.eclipse.lsp4e.debug" version="0.0.0"/>
 		</location>
@@ -37,8 +37,9 @@
 			<unit id="org.eclipse.swtbot.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-			<repository location="https://download.eclipse.org/tm4e/releases/0.4.3/"/>
+			<repository location="https://download.eclipse.org/tm4e/snapshots/"/>
 			<unit id="org.eclipse.tm4e.feature.feature.group" version="0.0.0"/>
+			<unit id="org.eclipse.tm4e.language_pack.feature.feature.group" version="0.0.0"/>
 		</location>
 		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
 			<repository location="https://download.eclipse.org/tools/cdt/releases/latest"/>