diff --git a/apps/openstacknetworking/BUCK b/apps/openstacknetworking/BUCK
index 7af8e0c..e44142f 100644
--- a/apps/openstacknetworking/BUCK
+++ b/apps/openstacknetworking/BUCK
@@ -1,13 +1,36 @@
-BUNDLES = [
-    '//apps/openstacknetworking/api:onos-apps-openstacknetworking-api',
-    '//apps/openstacknetworking/web:onos-apps-openstacknetworking-web',
-    '//apps/openstacknetworking/cli:onos-apps-openstacknetworking-cli',
+COMPILE_DEPS = [
+  '//lib:CORE_DEPS',
+  '//core/store/serializers:onos-core-serializers',
+  '//lib:org.apache.karaf.shell.console',
+  '//lib:javax.ws.rs-api',
+  '//utils/rest:onlab-rest',
+  '//cli:onos-cli',
+  '//apps/openstacknode:onos-apps-openstacknode',
+  '//apps/openstackinterface/api:onos-apps-openstackinterface-api',
+  '//apps/openstackinterface/app:onos-apps-openstackinterface-app',
+  '//apps/scalablegateway:onos-apps-scalablegateway',
+  '//apps/dhcp/api:onos-apps-dhcp-api',
 ]
 
+osgi_jar_with_tests (
+  deps = COMPILE_DEPS,
+  web_context = '/onos/openstacknetworking',
+  api_title = 'OpenStack Networking App API',
+  api_version = '1.0',
+  api_description = 'REST API for OpenStack Networking App',
+  api_package = 'org.onosproject.openstacknetworking.web',
+)
+
 onos_app (
+  app_name = 'org.onosproject.openstacknetworking',
   title = 'OpenStack Networking App',
   category = 'Utility',
   url = 'http://onosproject.org',
-  included_bundles = BUNDLES,
-  required_apps = [ 'org.onosproject.openstackrouting', 'org.onosproject.openstackswitching' ]
+  description = 'OpenStack Networking application.',
+  required_apps = [
+    'org.onosproject.dhcp',
+    'org.onosproject.openstacknode',
+    'org.onosproject.openstackinterface',
+    'org.onosproject.scalablegateway'
+  ]
 )