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 66c711985..d0b33cc9b 100644
--- a/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.bosh.ls/plugin.xml
@@ -5,7 +5,6 @@
    <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"
@@ -20,7 +19,6 @@
    <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"
diff --git a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml
index d570777f3..8e1ceb47a 100644
--- a/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.cloudfoundry.manifest.ls.integration/plugin.xml
@@ -5,7 +5,6 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
-            base-type="org.eclipse.core.runtime.text"
             default-charset="UTF-8"
             id="org.springframework.boot.ide.manifest.yml"
             name="Cloudfoundry Manifest"
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 0bc490d89..cd4a25b2b 100644
--- a/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.concourse.ls/plugin.xml
@@ -5,7 +5,6 @@
    <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="Cloudfoundry Pipeline"
@@ -20,7 +19,6 @@
    <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="Cloudfoundry Pipeline"
@@ -90,12 +88,12 @@
       </server>
       <contentTypeMapping
             contentType="org.springframework.tooling.concourse.pipeline"
-            id="org.springframework.tooling.concourse.pipeline"
+            id="org.eclipse.languageserver.languages.concourse"
             languageId="concourse-pipeline-yaml">
       </contentTypeMapping>
       <contentTypeMapping
             contentType="org.springframework.tooling.concourse.task"
-            id="org.springframework.tooling.concourse.task"
+            id="org.eclipse.languageserver.languages.concourse"
             languageId="concourse-task-yaml">
       </contentTypeMapping>
    </extension>
diff --git a/eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml b/eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml
index 8d7011e19..17e3f3e9f 100644
--- a/eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml
+++ b/eclipse-language-servers/org.springframework.tooling.properties.ls/plugin.xml
@@ -5,7 +5,6 @@
    <extension
          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"
@@ -20,7 +19,6 @@
    <extension
          point="org.eclipse.core.contenttype.contentTypes">
       <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"