diff --git a/apps/openstacknetworking/app/app.xml b/apps/openstacknetworking/app/app.xml
index c016e85..911e1e9 100644
--- a/apps/openstacknetworking/app/app.xml
+++ b/apps/openstacknetworking/app/app.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  ~ Copyright 2015 Open Networking Laboratory
+  ~ Copyright 2015-2016 Open Networking Laboratory
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -17,12 +17,9 @@
 <app name="org.onosproject.openstacknetworking" origin="ON.Lab" version="${project.version}"
      category="default" url="http://onosproject.org"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
-     features="${project.artifactId}">
+     features="${project.artifactId}"
+     apps="org.onosproject.openstackswitching,org.onosproject.openstackrouting">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-dhcp-api/${project.version}</artifact>
-    <artifact>mvn:${project.groupId}/onos-app-dhcp/${project.version}</artifact>
 </app>
diff --git a/apps/openstacknetworking/app/features.xml b/apps/openstacknetworking/app/features.xml
index 7a69ffd..3f54d11 100644
--- a/apps/openstacknetworking/app/features.xml
+++ b/apps/openstacknetworking/app/features.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <!--
-  ~ Copyright 2015-16 Open Networking Laboratory
+  ~ Copyright 2015-2016 Open Networking Laboratory
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@
         <feature>onos-api</feature>
         <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle>
         <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-web/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-dhcp-api/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-dhcp/${project.version}</bundle>
-        <bundle>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</bundle>
         <bundle>mvn:com.sun.jersey/jersey-client/1.19</bundle>
     </feature>
 </features>
diff --git a/apps/openstacknetworking/openstackrouting/app.xml b/apps/openstacknetworking/openstackrouting/app.xml
new file mode 100644
index 0000000..fb7174d
--- /dev/null
+++ b/apps/openstacknetworking/openstackrouting/app.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2016 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<app name="org.onosproject.openstackrouting" origin="ON.Lab" version="${project.version}"
+     category="default" url="http://onosproject.org"
+     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
+     features="${project.artifactId}" >
+    <description>${project.description}</description>
+    <artifact>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact>
+</app>
diff --git a/apps/openstacknetworking/openstackrouting/features.xml b/apps/openstacknetworking/openstackrouting/features.xml
new file mode 100644
index 0000000..df366c7
--- /dev/null
+++ b/apps/openstacknetworking/openstackrouting/features.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright 2016 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
+    <feature name="${project.artifactId}" version="${project.version}"
+             description="${project.description}">
+        <feature>onos-api</feature>
+        <bundle>mvn:${project.groupId}/onos-app-openstackrouting/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle>
+    </feature>
+</features>
diff --git a/apps/openstacknetworking/openstackrouting/pom.xml b/apps/openstacknetworking/openstackrouting/pom.xml
index 54a3a5a..ffd5de9 100644
--- a/apps/openstacknetworking/openstackrouting/pom.xml
+++ b/apps/openstacknetworking/openstackrouting/pom.xml
@@ -49,6 +49,5 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
 </project>
 
diff --git a/apps/openstacknetworking/openstackswitching/app.xml b/apps/openstacknetworking/openstackswitching/app.xml
new file mode 100644
index 0000000..5df63f3
--- /dev/null
+++ b/apps/openstacknetworking/openstackswitching/app.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2016 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<app name="org.onosproject.openstackswitching" origin="ON.Lab" version="${project.version}"
+     category="default" url="http://onosproject.org"
+     featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
+     features="${project.artifactId}"
+     apps="org.onosproject.dhcp">
+    <description>${project.description}</description>
+    <artifact>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</artifact>
+    <artifact>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</artifact>
+</app>
diff --git a/apps/openstacknetworking/openstackswitching/features.xml b/apps/openstacknetworking/openstackswitching/features.xml
new file mode 100644
index 0000000..ec62059
--- /dev/null
+++ b/apps/openstacknetworking/openstackswitching/features.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!--
+  ~ Copyright 2016 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<features xmlns="http://karaf.apache.org/xmlns/features/v1.2.0" name="${project.artifactId}-${project.version}">
+    <feature name="${project.artifactId}" version="${project.version}"
+             description="${project.description}">
+        <feature>onos-api</feature>
+        <bundle>mvn:${project.groupId}/onos-app-openstacknetworking-api/${project.version}</bundle>
+        <bundle>mvn:${project.groupId}/onos-app-openstackswitching/${project.version}</bundle>
+    </feature>
+</features>
diff --git a/apps/openstacknetworking/openstackswitching/pom.xml b/apps/openstacknetworking/openstackswitching/pom.xml
index b5b6d65..932da8f 100644
--- a/apps/openstacknetworking/openstackswitching/pom.xml
+++ b/apps/openstacknetworking/openstackswitching/pom.xml
@@ -38,12 +38,12 @@
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-dhcp</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
             <artifactId>onos-app-dhcp-api</artifactId>
-            <version>1.5.0-SNAPSHOT</version>
+            <version>${project.version}</version>
         </dependency>
         <dependency>
             <groupId>org.onosproject</groupId>
@@ -61,6 +61,4 @@
             <version>${project.version}</version>
         </dependency>
     </dependencies>
-
-
 </project>
diff --git a/apps/openstacknetworking/pom.xml b/apps/openstacknetworking/pom.xml
index cdf3a1c..e530c36 100644
--- a/apps/openstacknetworking/pom.xml
+++ b/apps/openstacknetworking/pom.xml
@@ -37,9 +37,5 @@
         <module>openstackrouting</module>
     </modules>
 
-
-    <description>SONA Openstack Networking XXXX Application</description>
-
-    <dependencies>
-    </dependencies>
+    <description>SONA Openstack Networking Application</description>
 </project>