diff --git a/apps/l3vpn/BUCK b/apps/l3vpn/BUCK
index 3ab949f..4e6aaf3 100644
--- a/apps/l3vpn/BUCK
+++ b/apps/l3vpn/BUCK
@@ -1,19 +1,41 @@
-APPS = [
-  'org.onosproject.yang',
+COMPILE_DEPS = [
+    '//lib:CORE_DEPS',
+    '//models/l3vpn:onos-models-l3vpn',
+    '//apps/config:onos-apps-config',
+    '//core/store/serializers:onos-core-serializers',
+    '//lib:onos-yang-model',
+    '//lib:onos-yang-runtime',
+    '//apps/yang:onos-apps-yang',
 ]
 
-BUNDLES = [
-  '//apps/l3vpn/yangmodel:onos-apps-l3vpn-yangmodel',
-  '//apps/l3vpn/netl3vpn:onos-apps-l3vpn-netl3vpn',
+TEST_DEPS = [
+    '//lib:TEST_ADAPTERS',
+    '//utils/osgi:onlab-osgi-tests',
 ]
 
+APPS = [
+    'org.onosproject.yang',
+    'org.onosproject.yang-gui',
+    'org.onosproject.config',
+    'org.onosproject.restconf',
+    'org.onosproject.yms',
+    'org.onosproject.protocols.restconfserver',
+    'org.onosproject.netconf',
+    'org.onosproject.netconfsb',
+    'org.onosproject.models.l3vpn',
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+    test_deps = TEST_DEPS,
+)
+
 onos_app(
-  app_name = 'org.onosproject.l3vpn',
-  title = 'YANG L3VPN App',
-  category = 'Traffic Steering',
-  url = 'http://onosproject.org',
-  included_bundles = BUNDLES,
-  description = 'L3VPN YANG Application',
-  required_apps = APPS,
+    app_name = 'org.onosproject.l3vpn',
+    title = 'YANG L3VPN App',
+    category = 'Traffic Steering',
+    url = 'http://onosproject.org',
+    description = 'L3VPN YANG Application',
+    required_apps = APPS,
 )