diff --git a/headless-services/commons/pom.xml b/headless-services/commons/pom.xml
index 27ac53388..9d7700bfc 100644
--- a/headless-services/commons/pom.xml
+++ b/headless-services/commons/pom.xml
@@ -24,11 +24,10 @@
 	</modules>
 
 	<repositories>
-	<!-- Note: avoid using this repo, it can block project builds for long time.
 		<repository>
 			<id>lsp4j-snapshots-repo</id>
 			<name>lsp4j-snapshots-repo</name>
-			<url>http://services.typefox.io/open-source/jenkins/job/lsp4j/lastSuccessfulBuild/artifact/build/maven-repository/</url>
+			<url>https://oss.sonatype.org/content/repositories/snapshots/org/eclipse/lsp4j/</url>
 			<releases>
 				<enabled>true</enabled>
 			</releases>
@@ -36,7 +35,7 @@
 				<enabled>true</enabled>
 			</snapshots>
 		</repository>
-		-->
+
 		<repository>
 			<id>spring-milestones</id>
 			<name>Spring Milestones</name>
@@ -81,7 +80,7 @@
 		<mockito-version>1.10.19</mockito-version>
 		<jackson-2-version>2.5.0</jackson-2-version>
 		<jersey-2-version>2.10</jersey-2-version>
-		<lsp4j-version>0.3.0</lsp4j-version>
+		<lsp4j-version>0.4.0-SNAPSHOT</lsp4j-version>
 		<!-- NOTE: Reactor version must match version used by the CF client -->
 		<reactor-version>3.0.5.RELEASE</reactor-version>
 		<reactor-netty>0.6.0.RELEASE</reactor-netty>