diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java
index b677f0ba7..85a30333c 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/src/org/springframework/tooling/boot/ls/SpringBootLanguageServer.java
@@ -62,6 +62,12 @@ public class SpringBootLanguageServer extends STS4LanguageServerProcessStreamCon
 
 			command.addAll(getJVMArgs());
 			
+			StringBuilder configLocation = new StringBuilder(languageServerRoot);
+			configLocation.append("BOOT-INF" + File.separator + "classes");
+			configLocation.append(File.separator);
+			configLocation.append("application.properties");
+			command.add("-Dspring.config.location=file:" + configLocation.toString());
+			
 			command.add("org.springframework.ide.vscode.boot.app.BootLanguagServerBootApp");
 			setCommands(command.build());
 		}
diff --git a/headless-services/spring-boot-language-server/src/main/resources/application.properties b/headless-services/spring-boot-language-server/src/main/resources/application.properties
new file mode 100644
index 000000000..144abc886
--- /dev/null
+++ b/headless-services/spring-boot-language-server/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.main.banner-mode=off
+languageserver.extension-id=vscode-spring-boot
+languageserver.completion-trigger-characters=abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.
diff --git a/headless-services/spring-boot-language-server/src/main/resources/application.yml b/headless-services/spring-boot-language-server/src/main/resources/application.yml
deleted file mode 100644
index 0e6c8f7e2..000000000
--- a/headless-services/spring-boot-language-server/src/main/resources/application.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-languageserver:
-  extension-id: vscode-spring-boot
-  completion-trigger-characters: abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ.
\ No newline at end of file