diff --git a/headless-services/boot-java-language-server/.project b/headless-services/boot-java-language-server/.project
index f890d30fd..05453dd68 100644
--- a/headless-services/boot-java-language-server/.project
+++ b/headless-services/boot-java-language-server/.project
@@ -15,6 +15,11 @@
 			<arguments>
 			</arguments>
 		</buildCommand>
+		<buildCommand>
+			<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
 		<nature>org.eclipse.jdt.core.javanature</nature>
diff --git a/headless-services/boot-java-language-server/.settings/org.springframework.ide.eclipse.prefs b/headless-services/boot-java-language-server/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 000000000..a12794d68
--- /dev/null
+++ b/headless-services/boot-java-language-server/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/headless-services/boot-language-server/.settings/org.springframework.ide.eclipse.prefs b/headless-services/boot-language-server/.settings/org.springframework.ide.eclipse.prefs
new file mode 100644
index 000000000..a12794d68
--- /dev/null
+++ b/headless-services/boot-language-server/.settings/org.springframework.ide.eclipse.prefs
@@ -0,0 +1,2 @@
+boot.validation.initialized=true
+eclipse.preferences.version=1
diff --git a/headless-services/boot-language-server/pom.xml b/headless-services/boot-language-server/pom.xml
index 63fa3ea43..5ba4a7bc8 100644
--- a/headless-services/boot-language-server/pom.xml
+++ b/headless-services/boot-language-server/pom.xml
@@ -22,11 +22,6 @@
 			<artifactId>boot-java-language-server</artifactId>
 			<version>${dependencies.version}</version>
 		</dependency>
-		<dependency>
-			<groupId>org.springframework.ide.vscode</groupId>
-			<artifactId>boot-properties-language-server</artifactId>
-			<version>${dependencies.version}</version>
-		</dependency>
 		
 		<!-- Test harness -->
 		<dependency>
@@ -42,7 +37,12 @@
 			<version>${mockito-version}</version>
 			<scope>test</scope>
 		</dependency>
-		
+
+		<dependency>
+			<groupId>org.springframework.ide.vscode</groupId>
+			<artifactId>commons-boot</artifactId>
+			<version>0.1.4-SNAPSHOT</version>
+		</dependency>
 	</dependencies>
 	<build>
 		<plugins>