diff --git a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
index 23360eb59..671efd4fe 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -39,6 +39,7 @@
          point="org.eclipse.core.contenttype.contentTypes">
 
       <content-type
+            base-type="org.eclipse.jdt.core.javaProperties"
             default-charset="ISO-8859-1"
             id="org.springframework.boot.ide.properties.application.properties"
             name="Spring Properties File"
@@ -46,6 +47,7 @@
       </content-type>
 
       <content-type
+            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
             id="org.springframework.boot.ide.properties.application.yml"
             name="Spring Yaml Properties File"
@@ -310,4 +312,26 @@
 
    </extension>
 
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.boot.ide.properties.application.properties">
+      </participant>
+   </extension>
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.boot.ide.properties.application.yml">
+      </participant>
+   </extension>
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.boot.ide.xmlconfig">
+      </participant>
+   </extension>
+
 </plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
index 8a9358ad5..b6749209a 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
@@ -5,6 +5,7 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
+            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
             id="org.springframework.tooling.bosh.manifest"
             name="BOSH Deployment Manifest"
@@ -19,6 +20,7 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
+            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
             id="org.springframework.tooling.bosh.cloudconfig"
             name="BOSH Cloud Config"
@@ -98,4 +100,18 @@
       </contentTypeMapping>
    </extension>
 
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.tooling.bosh.manifest">
+      </participant>
+   </extension>
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.tooling.bosh.cloudconfig">
+      </participant>
+   </extension>
 </plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml
index 4d699280d..3da9fd66c 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls/plugin.xml
@@ -19,10 +19,11 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
+            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
+            file-names="manifest.yml"
             id="org.springframework.ide.eclipse.manifest.yml"
             name="Cloudfoundry Manifest"
-            file-names="manifest.yml"
             priority="high">
       </content-type>
       <file-association
@@ -67,4 +68,12 @@
       </scopeNameContentTypeBinding>
    </extension>
    
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.ide.eclipse.manifest.yml">
+      </participant>
+   </extension>
+
 </plugin>
diff --git a/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
index 0411ef639..dd0977fe0 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
@@ -5,6 +5,7 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
+            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
             id="org.springframework.tooling.concourse.pipeline"
             name="Concourse Pipeline Definition"
@@ -19,6 +20,7 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
+            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
             id="org.springframework.tooling.concourse.task"
             name="Concourse Task Definition"
@@ -98,4 +100,19 @@
       </contentTypeMapping>
    </extension>
 
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.tooling.concourse.pipeline">
+      </participant>
+   </extension>
+   <extension
+         point="org.eclipse.core.filebuffers.documentSetup">
+      <participant
+            class="org.eclipse.lsp4e.ConnectDocumentToLanguageServerSetupParticipant"
+            contentTypeId="org.springframework.tooling.concourse.task">
+      </participant>
+   </extension>
+
 </plugin>