diff --git a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java
index 1fd9c589e..3ab76ae53 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.boot.java.ls/src/org/springframework/tooling/boot/java/ls/SpringBootJavaLanguageServer.java
@@ -43,9 +43,12 @@ public class SpringBootJavaLanguageServer extends ProcessStreamConnectionProvide
 		List<String> commands = new ArrayList<>();
 		commands.add(getJDKLocation());
 		
-		commands.add("-Xdebug");
-		commands.add("-Xrunjdwp:server=y,transport=dt_socket,address=4000,suspend=n");
+//		commands.add("-Xdebug");
+//		commands.add("-Xrunjdwp:server=y,transport=dt_socket,address=4000,suspend=n");
 		
+		commands.add("-Dlsp.lazy.completions.disable=true");
+		commands.add("-Dlsp.completions.indentation.enable=true");
+
 		commands.add("-jar");
 		commands.add(getLanguageServerJARLocation());
 
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java
index 356ba1118..29515fc4f 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/src/org/springframework/tooling/bosh/ls/BoshLanguageServer.java
@@ -42,6 +42,13 @@ public class BoshLanguageServer extends ProcessStreamConnectionProvider {
 	public BoshLanguageServer() {
 		List<String> commands = new ArrayList<>();
 		commands.add(getJDKLocation());
+
+//		commands.add("-Xdebug");
+//		commands.add("-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n");
+
+		commands.add("-Dlsp.lazy.completions.disable=true");
+		commands.add("-Dlsp.completions.indentation.enable=true");
+
 		commands.add("-jar");
 		commands.add(getLanguageServerJARLocation());
 
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
index 7e7bf68d0..f42b3aa2c 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/src/org/springframework/tooling/cloudfoundry/manifest/ls/CloudFoundryManifestLanguageServer.java
@@ -49,15 +49,20 @@ public class CloudFoundryManifestLanguageServer extends ProcessStreamConnectionP
 
 	public CloudFoundryManifestLanguageServer() {
 		List<String> commands = new ArrayList<>();
+		
 		commands.add(getJDKLocation());
+
+//		commands.add("-Xdebug");
+//		commands.add("-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n");
+
+//		commands.add("-Dlsp.lazy.completions.disable=true");
+		commands.add("-Dlsp.completions.indentation.enable=true");
+
 		commands.add("-jar");
 		commands.add(getLanguageServerJARLocation());
 
 		String workingDir = getWorkingDirLocation();
 
-//		commands.add("-Xdebug");
-//		commands.add("-agentlib:jdwp=transport=dt_socket,address=9999,server=y,suspend=n");
-
 		setCommands(commands);
 		setWorkingDirectory(workingDir);
 	}
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java
index 16f38c1cd..92ac207bb 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/src/org/springframework/tooling/concourse/ls/ConcourseLanguageServer.java
@@ -42,6 +42,13 @@ public class ConcourseLanguageServer extends ProcessStreamConnectionProvider {
 	public ConcourseLanguageServer() {
 		List<String> commands = new ArrayList<>();
 		commands.add(getJDKLocation());
+
+//		commands.add("-Xdebug");
+//		commands.add("-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n");
+
+		commands.add("-Dlsp.lazy.completions.disable=true");
+		commands.add("-Dlsp.completions.indentation.enable=true");
+
 		commands.add("-jar");
 		commands.add(getLanguageServerJARLocation());
 
diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java b/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java
index 3912695c6..32ab8c49b 100644
--- a/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java
+++ b/eclipse-language-servers/org.springframework.tooling.properties.ls/src/org/springframework/tooling/properties/ls/SpringBootPropertiesLanguageServer.java
@@ -42,6 +42,13 @@ public class SpringBootPropertiesLanguageServer extends ProcessStreamConnectionP
 	public SpringBootPropertiesLanguageServer() {
 		List<String> commands = new ArrayList<>();
 		commands.add(getJDKLocation());
+
+//		commands.add("-Xdebug");
+//		commands.add("-agentlib:jdwp=transport=dt_socket,address=8899,server=y,suspend=n");
+
+		commands.add("-Dlsp.lazy.completions.disable=true");
+		commands.add("-Dlsp.completions.indentation.enable=true");
+
 		commands.add("-jar");
 		commands.add(getLanguageServerJARLocation());