diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
index bb25253d3..59d8fcde6 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e47/org.springframework.boot.ide.product
@@ -83,7 +83,9 @@ openFile</programArgs>
       <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
       <feature id="org.springframework.boot.ide.properties.servers.feature" installMode="root"/>
       <feature id="org.springframework.boot.ide.java.servers.feature" installMode="root"/>
-      <feature id="org.springframework.boot.ide.cloudfoundry.server.feature" installMode="root"/>
+
+      <feature id="org.springframework.boot.ide.cloudfoundry.manifest.integration.feature" installMode="root"/>
+      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
 
    </features>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
index 7c3f559ae..73142affe 100644
--- a/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.repository.e47/category.xml
@@ -46,7 +46,12 @@
 	<category-def name="Spring Boot IDE Language Servers for Eclipse" label="Spring Boot IDE Language Servers for Eclipse"/>
 
 	<feature
-		id="org.springframework.boot.ide.cloudfoundry.server.feature" version="0.0.0">
+		id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" version="0.0.0">
+		<category name="Spring Boot IDE Language Servers for Eclipse" />
+	</feature>
+
+	<feature
+		id="org.springframework.boot.ide.cloudfoundry.manifest.integration.feature" version="0.0.0">
 		<category name="Spring Boot IDE Language Servers for Eclipse" />
 	</feature>
 
diff --git a/eclipse-distribution/pom.xml b/eclipse-distribution/pom.xml
index 20a572483..86ac20d16 100644
--- a/eclipse-distribution/pom.xml
+++ b/eclipse-distribution/pom.xml
@@ -191,7 +191,12 @@
 		<repository>
 			<id>spring-boot-language-servers</id>
 			<layout>p2</layout>
-			<url>http://dist.springsource.com/${dist.type}/TOOLS/sts4-language-servers/${dist.springboot-language-servers-pathpostfix}</url>
+			<url>http://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server/${dist.springboot-language-servers-pathpostfix}</url>
+		</repository>
+		<repository>
+			<id>spring-boot-language-servers</id>
+			<layout>p2</layout>
+			<url>http://dist.springsource.com/${dist.type}/TOOLS/sts4-language-server-integrations/${dist.springboot-language-servers-pathpostfix}</url>
 		</repository>
 		<repository>
 			<id>springide</id>