diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e410/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e410/category.xml
index 5373cae79..209341358 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e410/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/category.xml
@@ -40,11 +40,21 @@
 		<category name="Extensions / Spring IDE" />
 	</feature>
 
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature>
+
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
 	</feature>
 
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature>
+
 	<!-- Language Server -->
 	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
index c7a7ee754..b64294124 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e410/org.springframework.boot.ide.product
@@ -93,12 +93,10 @@
 
       <feature id="org.springframework.boot.ide.branding.feature"/>
       <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
+      <feature id="org.springframework.ide.eclipse.xml.namespaces.feature" installMode="root"/>
 
       <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
-
-      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
       <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
-
       <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
       <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
    </features>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e411/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e411/category.xml
index 5373cae79..209341358 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e411/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e411/category.xml
@@ -40,11 +40,21 @@
 		<category name="Extensions / Spring IDE" />
 	</feature>
 
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature>
+
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
 	</feature>
 
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature>
+
 	<!-- Language Server -->
 	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
 
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product
index ad80282d3..29dfddac9 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e411/org.springframework.boot.ide.product
@@ -94,12 +94,10 @@
 
       <feature id="org.springframework.boot.ide.branding.feature"/>
       <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
+      <feature id="org.springframework.ide.eclipse.xml.namespaces.feature" installMode="root"/>
 
       <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
-
-      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
       <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
-
       <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
       <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
    </features>
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml b/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
index 5373cae79..2088fa91a 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/category.xml
@@ -40,11 +40,21 @@
 		<category name="Extensions / Spring IDE" />
 	</feature>
 
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature" version="0.0.0">
+		<category name="Extensions / Spring IDE" />
+	</feature>
+
 	<feature
 		id="org.springframework.ide.eclipse.boot.dash.feature.source" version="0.0.0">
 		<category name="Resources / Spring IDE" />
 	</feature>
 
+	<feature
+		id="org.springframework.ide.eclipse.xml.namespaces.feature.source" version="0.0.0">
+		<category name="Resources / Spring IDE" />
+	</feature>
+
 	<!-- Language Server -->
 	<category-def name="Spring Tool Suite 4 Language Server Integrations for Eclipse" label="Spring Tool Suite 4 Language Server Integrations for Eclipse"/>
 
@@ -53,11 +63,6 @@
 		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
 	</feature>
 
-	<feature
-		id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" version="0.0.0">
-		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
-	</feature>
-
 	<feature
 		id="org.springframework.tooling.boot.ls.feature" version="0.0.0">
 		<category name="Spring Tool Suite 4 Language Server Integrations for Eclipse" />
diff --git a/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product b/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
index ad80282d3..29dfddac9 100644
--- a/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
+++ b/eclipse-distribution/org.springframework.boot.ide.product.e412/org.springframework.boot.ide.product
@@ -94,12 +94,10 @@
 
       <feature id="org.springframework.boot.ide.branding.feature"/>
       <feature id="org.springframework.boot.ide.main.feature" installMode="root"/>
+      <feature id="org.springframework.ide.eclipse.xml.namespaces.feature" installMode="root"/>
 
       <feature id="org.springframework.tooling.boot.ls.feature" installMode="root"/>
-
-      <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.integration.feature" installMode="root"/>
       <feature id="org.springframework.tooling.cloudfoundry.manifest.ls.feature" installMode="root"/>
-
       <feature id="org.springframework.tooling.bosh.ls.feature" installMode="root"/>
       <feature id="org.springframework.tooling.concourse.ls.feature" installMode="root"/>
    </features>
diff --git a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
index fea482f6e..52d1ad044 100644
--- a/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
+++ b/eclipse-extensions/org.springframework.boot.ide.main.feature/feature.xml
@@ -17,6 +17,10 @@
        %license
     </license>
 
+    <requires>
+       <import feature="org.springframework.ide.eclipse.xml.namespaces.feature" version="3.9.9" match="greaterOrEqual"/>
+    </requires>
+
     <plugin
           id="org.springframework.ide.eclipse.boot"
           download-size="0"
@@ -87,12 +91,4 @@
           version="0.0.0"
           unpack="false"/>
 
-    <plugin
-          id="org.springframework.ide.eclipse.xml.namespaces"
-          download-size="0"
-          install-size="0"
-          version="0.0.0"
-          unpack="false"/>
-
-
 </feature>