diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index c27e41bdd..c3fa84c40 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -179,7 +179,7 @@
 					<url>http://www.mihai-nita.net/eclipse</url>
 				</repository>
 				<repository>
-					<id>lsp4j</id>
+					<id>xtext-base</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
 				</repository>
@@ -208,7 +208,7 @@
 			</properties>
 			<repositories>
 				<repository>
-					<id>oxygen</id>
+					<id>photon</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/releases/photon/</url>
 				</repository>
@@ -217,11 +217,21 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/staging/photon/</url>
 				</repository> -->
-<!--				<repository>
-					<id>platform-m-build</id>
+				<repository>
+					<id>platform-i-builds</id>
 					<layout>p2</layout>
-					<url>http://download.eclipse.org/eclipse/updates/4.8-M-builds</url>
+					<url>http://download.eclipse.org/eclipse/updates/4.8-I-builds/</url>
+				</repository>
+<!--				<repository>
+					<id>orbit</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20171130170529/repository/</url>
 				</repository> -->
+				<repository>
+					<id>orbit-i-builds</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</url>
+				</repository>
 				<repository>
 					<id>latest-m2e</id>
 					<layout>p2</layout>
@@ -232,11 +242,6 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/technology/m2e/milestones/1.8/</url>
 				</repository>
-				<repository>
-					<id>orbit</id>
-					<layout>p2</layout>
-					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20171130170529/repository/</url>
-				</repository>
 				<repository>
 					<id>latest-buildship-release</id>
 					<layout>p2</layout>
@@ -273,7 +278,7 @@
 					<url>http://www.mihai-nita.net/eclipse</url>
 				</repository>
 				<repository>
-					<id>lsp4j</id>
+					<id>xtext-base</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/modeling/tmf/xtext/updates/milestones/</url>
 				</repository>
@@ -282,6 +287,11 @@
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/lsp4e/snapshots/</url>
 				</repository>
+				<repository>
+					<id>lsp4j</id>
+					<layout>p2</layout>
+					<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/job/master/lastSuccessfulBuild/artifact/build/p2-repository/</url>
+				</repository>
 			</repositories>
 			<modules>
 				<module>org.springframework.boot.ide.product.e48</module>
diff --git a/eclipse-language-servers/pom.xml b/eclipse-language-servers/pom.xml
index f9a278cc4..2bdceaad0 100644
--- a/eclipse-language-servers/pom.xml
+++ b/eclipse-language-servers/pom.xml
@@ -176,9 +176,19 @@
 					<url>http://download.eclipse.org/staging/photon/</url>
 				</repository> -->
 				<repository>
+					<id>platform-i-builds</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/eclipse/updates/4.8-I-builds/</url>
+				</repository>
+<!--				<repository>
 					<id>orbit</id>
 					<layout>p2</layout>
 					<url>http://download.eclipse.org/tools/orbit/downloads/drops/S20171130170529/repository/</url>
+				</repository> -->
+				<repository>
+					<id>orbit-i-builds</id>
+					<layout>p2</layout>
+					<url>http://download.eclipse.org/tools/orbit/downloads/latest-I/</url>
 				</repository>
 				<repository>
 					<id>lsp4j-snapshots</id>