diff --git a/apps/p4-tutorial/mytunnel/BUILD b/apps/p4-tutorial/mytunnel/BUILD
new file mode 100644
index 0000000..415084e
--- /dev/null
+++ b/apps/p4-tutorial/mytunnel/BUILD
@@ -0,0 +1,23 @@
+COMPILE_DEPS = CORE_DEPS + [
+    "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf",
+]
+
+osgi_jar (
+    deps = COMPILE_DEPS,
+)
+
+BUNDLES = [
+    "//apps/p4-tutorial/mytunnel:onos-apps-p4-tutorial-mytunnel",
+]
+
+onos_app (
+    app_name = "org.onosproject.p4tutorial.mytunnel",
+    title = "MyTunnel Demo App",
+    category = "Traffic Engineering",
+    url = "http://onosproject.org",
+    description = "Provides forwarding between each pair of hosts via MyTunnel protocol",
+    included_bundles = BUNDLES,
+    required_apps = [
+        "org.onosproject.p4tutorial.pipeconf",
+    ]
+)
diff --git a/apps/p4-tutorial/pipeconf/BUILD b/apps/p4-tutorial/pipeconf/BUILD
new file mode 100644
index 0000000..2a39cbb
--- /dev/null
+++ b/apps/p4-tutorial/pipeconf/BUILD
@@ -0,0 +1,26 @@
+COMPILE_DEPS = CORE_DEPS + [
+    "@minimal_json//jar",
+    "//protocols/p4runtime/model:onos-protocols-p4runtime-model",
+    "//protocols/p4runtime/api:onos-protocols-p4runtime-api",
+    "//drivers/default:onos-drivers-default",
+]
+
+osgi_jar (
+    deps = COMPILE_DEPS,
+)
+
+BUNDLES = [
+    "//apps/p4-tutorial/pipeconf:onos-apps-p4-tutorial-pipeconf",
+]
+
+onos_app (
+    app_name = "org.onosproject.p4tutorial.pipeconf",
+    title = "P4 Tutorial Pipeconf",
+    category = "Pipeconf",
+    url = "http://onosproject.org",
+    description = "Provides pipeconf for the ONOS-P4 Tutorial",
+    included_bundles = BUNDLES,
+    required_apps = [
+        "org.onosproject.drivers.p4runtime",
+    ]
+)
diff --git a/apps/route-service/app/BUILD b/apps/route-service/app/BUILD
index 4eb3fe3..885fa8b 100644
--- a/apps/route-service/app/BUILD
+++ b/apps/route-service/app/BUILD
@@ -13,9 +13,9 @@
 osgi_jar_with_tests(
     test_deps = TEST_DEPS,
     deps = COMPILE_DEPS,
-    #web_context = '/onos/routeservice',
-    #api_title = 'Route Service App',
-    #api_version = '1.0',
-    #api_description = 'REST API for Route Service App',
-    #api_package = 'org.onosproject.routeservice.rest',
+    #web_context = "/onos/routeservice",
+    #api_title = "Route Service App",
+    #api_version = "1.0",
+    #api_description = "REST API for Route Service App",
+    #api_package = "org.onosproject.routeservice.rest",
 )
diff --git a/apps/segmentrouting/web/BUILD b/apps/segmentrouting/web/BUILD
index 757a30f..9b683d3 100644
--- a/apps/segmentrouting/web/BUILD
+++ b/apps/segmentrouting/web/BUILD
@@ -6,9 +6,9 @@
 
 osgi_jar_with_tests(
     deps = COMPILE_DEPS,
-    #web_context = '/onos/segmentrouting',
-    #api_title = 'Segment Routing Rest Server',
-    #api_version = '1.0',
-    #api_description = 'REST API for Segment Routing Application',
-    #api_package = 'org.onosproject.segmentrouting.web',
+    #web_context = "/onos/segmentrouting",
+    #api_title = "Segment Routing Rest Server",
+    #api_version = "1.0",
+    #api_description = "REST API for Segment Routing Application",
+    #api_package = "org.onosproject.segmentrouting.web",
 )