diff --git a/aggregate/site/category.xml b/aggregate/site/category.xml
index d5371981..b8b7efb5 100644
--- a/aggregate/site/category.xml
+++ b/aggregate/site/category.xml
@@ -284,10 +284,19 @@
     <category name="CoreTools" />
     <category name="MavenTools"/>
   </feature>
-  <feature id="org.eclipse.linuxtools.docker.feature">
+  <!-- JBDS-3495 add plugins instead of feature to avoid p2.inf instruction which forces JBDS to include Docker nightly update site in disabled state -->
+  <bundle id="org.eclipse.linuxtools.docker.core">
     <category name="CoreTools" />
     <category name="GeneralTools"/>
-  </feature>
+  </bundle>
+  <bundle id="org.eclipse.linuxtools.docker.ui">
+    <category name="CoreTools" />
+    <category name="GeneralTools"/>
+  </bundle>
+  <bundle id="org.eclipse.linuxtools.docker.docs">
+    <category name="CoreTools" />
+    <category name="GeneralTools"/>
+  </bundle>
   <feature id="org.jboss.tools.wtp.server.launchbar.feature">
     <category name="WebTools" />
   </feature>