diff --git a/dist/comps.xml b/dist/comps.xml
index 0b5a53ec6b..823d559fd1 100644
--- a/dist/comps.xml
+++ b/dist/comps.xml
@@ -134,7 +134,6 @@
          <packagereq type="default">awips2-edex-cots</packagereq>
          <packagereq type="default">awips2-edex-dataplugins</packagereq>
          <packagereq type="default">awips2-edex-gfe</packagereq>
-         <packagereq type="default">awips2-gfesuite</packagereq>
          <packagereq type="default">awips2-edex-ncep</packagereq>
          <packagereq type="default">awips2-edex-shapefiles</packagereq>
          <packagereq type="default">awips2-edex-request</packagereq>
@@ -172,6 +171,70 @@
          <packagereq type="default">mod_ssl</packagereq>
       </packagelist>
    </group>
+   <group>
+      <id>awips2-dat</id>
+      <name>AWIPS EDEX DAT Server</name>
+      <default>true</default>
+      <description>This Will Install All Of The AWIPS Components That Are Required For A Standalone DAT/Hydro/DataDelivery Server</description>
+      <uservisible>true</uservisible>
+      <packagelist>
+         <packagereq type="default">awips2</packagereq>
+         <packagereq type="default">awips2-common-base</packagereq>
+         <packagereq type="default">awips2-database</packagereq>
+         <packagereq type="default">awips2-data.gfe</packagereq>
+         <packagereq type="default">awips2-data.hdf5-topo</packagereq>
+         <packagereq type="default">awips2-edex</packagereq>
+         <packagereq type="default">awips2-edex-base</packagereq>
+         <packagereq type="default">awips2-edex-common-core</packagereq>
+         <packagereq type="default">awips2-edex-core</packagereq>
+         <packagereq type="default">awips2-edex-cots</packagereq>
+         <packagereq type="default">awips2-edex-dataplugins</packagereq>
+         <packagereq type="default">awips2-edex-gfe</packagereq>
+         <packagereq type="default">awips2-edex-ncep</packagereq>
+         <packagereq type="default">awips2-edex-shapefiles</packagereq>
+         <packagereq type="default">awips2-edex-dat</packagereq>
+         <packagereq type="default">awips2-edex-datadelivery</packagereq>
+         <packagereq type="default">awips2-edex-hazards</packagereq>
+         <packagereq type="default">awips2-edex-ohd</packagereq>
+         <packagereq type="default">awips2-edex-ogc</packagereq>
+         <!-- <packagereq type="default">awips2-edex-swpc</packagereq> -->
+         <packagereq type="default">awips2-hydroapps</packagereq>
+         <packagereq type="default">awips2-httpd-pypies</packagereq>
+         <packagereq type="default">awips2-httpd-pypies-tools</packagereq>
+         <packagereq type="default">awips2-java</packagereq>
+         <packagereq type="default">awips2-ldm</packagereq>
+         <packagereq type="default">awips2-maps-database</packagereq>
+         <packagereq type="default">awips2-ncep-database</packagereq>
+         <packagereq type="default">awips2-postgresql</packagereq>
+         <packagereq type="default">awips2-psql</packagereq>
+         <packagereq type="default">awips2-pypies</packagereq>
+         <packagereq type="default">awips2-python</packagereq>
+         <packagereq type="default">awips2-python-awips</packagereq>
+         <packagereq type="default">awips2-python-cycler</packagereq>
+         <packagereq type="default">awips2-python-cython</packagereq>
+         <packagereq type="default">awips2-python-dateutil</packagereq>
+         <packagereq type="default">awips2-python-h5py</packagereq>
+         <packagereq type="default">awips2-python-jep</packagereq>
+         <packagereq type="default">awips2-python-matplotlib</packagereq>
+         <packagereq type="default">awips2-python-numpy</packagereq>
+         <packagereq type="default">awips2-python-pyparsing</packagereq>
+         <packagereq type="default">awips2-python-pytz</packagereq>
+         <packagereq type="default">awips2-python-qpid</packagereq>
+         <packagereq type="default">awips2-python-scientific</packagereq>
+         <packagereq type="default">awips2-python-scipy</packagereq>
+         <packagereq type="default">awips2-python-shapely</packagereq>
+         <packagereq type="default">awips2-python-six</packagereq>
+         <packagereq type="default">awips2-python-tables</packagereq>
+         <packagereq type="default">awips2-python-werkzeug</packagereq>
+         <packagereq type="default">awips2-qpid-java-broker</packagereq>
+         <packagereq type="default">awips2-qpid-java-client</packagereq>
+         <packagereq type="default">awips2-qpid-lib</packagereq>
+         <packagereq type="default">awips2-tools</packagereq>
+         <packagereq type="default">awips2-localization</packagereq>
+         <packagereq type="default">awips2-yajsw</packagereq>
+         <packagereq type="default">mod_ssl</packagereq>
+      </packagelist>
+   </group>
    <group>
       <id>awips2-server</id>
       <name>AWIPS EDEX Server</name>
@@ -191,7 +254,6 @@
          <packagereq type="default">awips2-edex-cots</packagereq>
          <packagereq type="default">awips2-edex-dataplugins</packagereq>
          <packagereq type="default">awips2-edex-gfe</packagereq>
-         <packagereq type="default">awips2-gfesuite</packagereq>
          <packagereq type="default">awips2-edex-ncep</packagereq>
          <packagereq type="default">awips2-edex-shapefiles</packagereq>
          <packagereq type="default">awips2-httpd-pypies</packagereq>
@@ -258,8 +320,6 @@
          <packagereq type="default">awips2-python-werkzeug</packagereq>
          <packagereq type="default">awips2-cave</packagereq>
          <packagereq type="default">awips2-cave-wrapper</packagereq>
-         <packagereq type="default">awips2-gfesuite</packagereq>
-         <packagereq type="default">awips2-notification</packagereq>
       </packagelist>
    </group>
 </comps>
diff --git a/edexOsgi/build.edex/build.xml b/edexOsgi/build.edex/build.xml
index 286200c9e9..a60d1e6a73 100644
--- a/edexOsgi/build.edex/build.xml
+++ b/edexOsgi/build.edex/build.xml
@@ -61,6 +61,14 @@
 			<param name="feature"
 				value="com.raytheon.uf.edex.dataplugins.feature" />
 		</antcall>
+		<antcall target="build">
+			<param name="feature"
+				value="com.raytheon.uf.edex.gfe.feature" />
+		</antcall>
+		<antcall target="build">
+			<param name="feature"
+				value="com.raytheon.uf.edex.ost.feature" />
+		</antcall>
 		<antcall target="build">
 			<param name="feature"
 				value="edu.ucar.unidata.uf.edex.unidata.feature" />
@@ -69,11 +77,6 @@
                         <param name="feature"
                                 value="com.raytheon.uf.edex.dat.feature" />
                 </antcall>
-		<antcall target="build">
-			<param name="feature"
-				value="com.raytheon.uf.edex.gfe.feature" />
-		</antcall>
-<!-- exp -->
 		<antcall target="build">
 			<param name="feature"
 				value="com.raytheon.uf.edex.ogc.feature" />
@@ -94,7 +97,6 @@
 			<param name="feature"
 				value="com.raytheon.uf.edex.hazards.feature" />
 		</antcall>
-
 	</target>
 
     <target name="main" depends="clean, init, main-build" />