diff --git a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
index 3084b661c9..c70983b93a 100644
--- a/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.dataplugins.feature/feature.xml
@@ -29,12 +29,6 @@
          install-size="0"
          version="0.0.0"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.airep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.binlightning"
          download-size="0"
@@ -131,12 +125,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.poessounding"
          download-size="0"
diff --git a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
index 9514d0d640..d6255876d3 100644
--- a/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
+++ b/cave/com.raytheon.uf.viz.ncep.dataplugins.feature/feature.xml
@@ -211,6 +211,18 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.airep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"/>                  
 
    <plugin
          id="com.raytheon.uf.common.remote.script"
diff --git a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
index fa3055565c..245123f1a0 100644
--- a/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
+++ b/edexOsgi/com.raytheon.uf.edex.dataplugins.feature/feature.xml
@@ -101,13 +101,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.edex.plugin.airep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.plugin.ccfp"
          download-size="0"
@@ -150,13 +143,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.edex.plugin.pirep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.edex.plugin.redbook"
          download-size="0"
@@ -248,20 +234,6 @@
          version="0.0.0"
          unpack="false"/>
 
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.airep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
    <plugin
          id="com.raytheon.uf.common.dataplugin.obs"
          download-size="0"
diff --git a/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml b/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
index 20c1bb5d41..88a57f7b9f 100644
--- a/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
+++ b/ncep/com.raytheon.uf.edex.ncep.feature/feature.xml
@@ -393,5 +393,33 @@
          install-size="0"
          version="0.0.0"
          unpack="false"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.edex.plugin.airep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.edex.plugin.pirep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.airep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+         
+   <plugin
+         id="gov.noaa.nws.ncep.common.dataplugin.pirep"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>                                    
 
 </feature>