diff --git a/releng/org.eclipse.cdt.repo/category.xml b/releng/org.eclipse.cdt.repo/category.xml
index 8d6012b751f..cd0abf9a8cb 100644
--- a/releng/org.eclipse.cdt.repo/category.xml
+++ b/releng/org.eclipse.cdt.repo/category.xml
@@ -254,35 +254,35 @@
    <bundle id="org.eclipse.cdt.jsoncdb.nvidia.source">
       <category name="extra-jsoncdb"/>
    </bundle>
-   <feature url="features/org.eclipse.remote_0.0.0.jar" id="org.eclipse.remote" version="0.0.0">
-      <category name="Remote Services"/>
+   <feature id="org.eclipse.remote">
+      <category name="remote"/>
    </feature>
-   <feature url="features/org.eclipse.remote.source_0.0.0.jar" id="org.eclipse.remote.source" version="0.0.0">
-      <category name="Remote Services SDK"/>
+   <feature id="org.eclipse.remote.source">
+      <category name="remote_sdk"/>
    </feature>
-   <feature url="features/org.eclipse.remote.serial_0.0.0.jar" id="org.eclipse.remote.serial" version="0.0.0">
-      <category name="Remote Serial Port"/>
+   <feature id="org.eclipse.remote.serial">
+      <category name="remote"/>
    </feature>
-   <feature url="features/org.eclipse.remote.serial.source_0.0.0.jar" id="org.eclipse.remote.serial.source" version="0.0.0">
-      <category name="Remote Console SDK"/>
+   <feature id="org.eclipse.remote.serial.source">
+      <category name="remote_sdk"/>
    </feature>
-   <feature url="features/org.eclipse.remote.console_0.0.0.jar" id="org.eclipse.remote.console" version="0.0.0">
-      <category name="Remote Console"/>
+   <feature id="org.eclipse.remote.console">
+      <category name="remote"/>
    </feature>
-   <feature url="features/org.eclipse.remote.console.source_0.0.0.jar" id="org.eclipse.remote.console.source" version="0.0.0">
-      <category name="Remote Console SDK"/>
+   <feature id="org.eclipse.remote.console.source">
+      <category name="remote_sdk"/>
    </feature>
-   <feature url="features/org.eclipse.remote.telnet_0.0.0.jar" id="org.eclipse.remote.telnet" version="0.0.0">
-      <category name="Telnet Protocol Support"/>
+   <feature id="org.eclipse.remote.telnet">
+      <category name="remote"/>
    </feature>
-   <feature url="features/org.eclipse.remote.telnet.source_0.0.0.jar" id="org.eclipse.remote.telnet.source" version="0.0.0">
-      <category name="Telnet Protocol Support SDK"/>
+   <feature id="org.eclipse.remote.telnet.source">
+      <category name="remote_sdk"/>
    </feature>
-   <feature url="features/org.eclipse.remote.proxy_0.0.0.jar" id="org.eclipse.remote.proxy" version="0.0.0">
-      <category name="Remote Proxy Agent"/>
+   <feature id="org.eclipse.remote.proxy">
+      <category name="remote"/>
    </feature>
-   <feature url="features/org.eclipse.remote.proxy.source_0.0.0.jar" id="org.eclipse.remote.proxy.source" version="0.0.0">
-      <category name="Remote Proxy Agent SDK"/>
+   <feature id="org.eclipse.remote.proxy.source">
+      <category name="remote_sdk"/>
    </feature>
    <category-def name="main" label="CDT Main Features"/>
    <category-def name="extra" label="CDT Optional Features"/>
@@ -304,4 +304,6 @@
          Additional compilers support for the JSON CDB parser.
       </description>
    </category-def>
+   <category-def name="remote" label="Remote Services"/>
+   <category-def name="remote_sdk" label="Remote Services SDK"/>
 </site>