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 8e1ceb47a..1367acb5c 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
@@ -6,20 +6,17 @@
          point="org.eclipse.core.contenttype.contentTypes">
       <content-type
             default-charset="UTF-8"
-            id="org.springframework.boot.ide.manifest.yml"
+            id="org.springframework.ide.eclipse.manifest.yml"
             name="Cloudfoundry Manifest"
+            file-names="manifest.yml"
             priority="high">
       </content-type>
-      <file-association
-            content-type="org.springframework.boot.ide.manifest.yml"
-            file-names="manifest.yml">
-      </file-association>
    </extension>
    
    <extension
          point="org.eclipse.ui.editors">
       <editorContentTypeBinding
-            contentTypeId="org.springframework.boot.ide.manifest.yml"
+            contentTypeId="org.springframework.ide.eclipse.manifest.yml"
             editorId="org.eclipse.ui.genericeditor.GenericEditor">
       </editorContentTypeBinding>
    </extension>
@@ -28,7 +25,7 @@
          point="org.eclipse.ui.genericeditor.presentationReconcilers">
       <presentationReconciler
             class="org.eclipse.tm4e.ui.text.TMPresentationReconciler"
-            contentType="org.springframework.boot.ide.manifest.yml">
+            contentType="org.springframework.ide.eclipse.manifest.yml">
       </presentationReconciler>
    </extension>
 
@@ -39,7 +36,7 @@
             path="./syntaxes/YAML.tmLanguage" >
       </grammar>      
       <scopeNameContentTypeBinding
-            contentTypeId="org.springframework.boot.ide.manifest.yml"
+            contentTypeId="org.springframework.ide.eclipse.manifest.yml"
             scopeName="source.yaml">
       </scopeNameContentTypeBinding>
    </extension>
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 538d4e5be..c4ebfb612 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
@@ -10,19 +10,6 @@
             clientImpl="org.springframework.tooling.ls.eclipse.commons.STS4LanguageClientImpl"
             label="Cloud Foundry Manifest Language Server">
       </server>
-      <contentTypeMapping
-            contentType="org.springframework.boot.ide.manifest.yml"
-            id="org.eclipse.languageserver.languages.cloudfoundrymanifest">
-      </contentTypeMapping>
-   </extension>
-
-   <extension
-         point="org.eclipse.lsp4e.languageServer">
-      <server
-            class="org.springframework.tooling.cloudfoundry.manifest.ls.CloudFoundryManifestLanguageServer"
-            id="org.eclipse.languageserver.languages.cloudfoundrymanifest"
-            label="Cloud Foundry Manifest Language Server">
-      </server>
       <contentTypeMapping
             contentType="org.springframework.ide.eclipse.manifest.yml"
             id="org.eclipse.languageserver.languages.cloudfoundrymanifest">