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 aceaad388..86af34284 100644
--- a/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.boot.ls/plugin.xml
@@ -66,8 +66,10 @@
       See: https://github.com/spring-projects/sts4/issues/320
   -->
       <content-type
-            base-type="org.eclipse.core.runtime.text" 
+            base-type="org.eclipse.core.runtime.text"
             default-charset="ISO-8859-1"
+            file-names="application.properties,application-dev.properties"
+            file-patterns="application-*.properties"
             id="org.springframework.boot.ide.properties.application.properties"
             name="Spring Properties File"
             priority="high">
@@ -76,6 +78,8 @@
       <content-type
             base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
+            file-names="application.yml,bootstrap.yml,application-dev.yml,application.yaml,bootstrap.yaml,application-dev.yaml"
+            file-patterns="application-*.yml,application-*.yaml"
             id="org.springframework.boot.ide.properties.application.yml"
             name="Spring Yaml Properties File"
             priority="high">
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 b6749209a..b4d804766 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
@@ -7,6 +7,7 @@
       <content-type
             base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
+            file-names="deployment.yml"
             id="org.springframework.tooling.bosh.manifest"
             name="BOSH Deployment Manifest"
             priority="high">
@@ -22,6 +23,7 @@
       <content-type
             base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
+            file-names="cloud-config.yml"
             id="org.springframework.tooling.bosh.cloudconfig"
             name="BOSH Cloud Config"
             priority="high">
@@ -100,18 +102,4 @@
       </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.concourse.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
index dd0977fe0..6a504a7da 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
@@ -7,6 +7,7 @@
       <content-type
             base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
+            file-names="pipeline.yml"
             id="org.springframework.tooling.concourse.pipeline"
             name="Concourse Pipeline Definition"
             priority="high">
@@ -22,6 +23,7 @@
       <content-type
             base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
+            file-names="task.yml"
             id="org.springframework.tooling.concourse.task"
             name="Concourse Task Definition"
             priority="high">
@@ -100,19 +102,5 @@
       </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>