diff --git a/apps/cfm/BUILD b/apps/cfm/BUILD
new file mode 100644
index 0000000..07008a5
--- /dev/null
+++ b/apps/cfm/BUILD
@@ -0,0 +1,13 @@
+BUNDLES = [
+    "//apps/cfm/api:onos-apps-cfm-api",
+    "//apps/cfm/app:onos-apps-cfm-app",
+    "//apps/cfm/nbi:onos-apps-cfm-nbi",
+]
+
+onos_app(
+    category = "Monitoring",
+    description = "Layer 2 Monitoring Connectivity Fault Management App",
+    included_bundles = BUNDLES,
+    title = "Layer 2 Monitoring CFM Application",
+    url = "http://onosproject.org",
+)
diff --git a/apps/cfm/api/BUILD b/apps/cfm/api/BUILD
new file mode 100644
index 0000000..8d87120
--- /dev/null
+++ b/apps/cfm/api/BUILD
@@ -0,0 +1,4 @@
+osgi_jar_with_tests(
+    test_deps = TEST_ADAPTERS,
+    deps = CORE_DEPS,
+)
diff --git a/apps/cfm/app/BUILD b/apps/cfm/app/BUILD
new file mode 100644
index 0000000..300086d
--- /dev/null
+++ b/apps/cfm/app/BUILD
@@ -0,0 +1,13 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + [
+    "//core/store/serializers:onos-core-serializers",
+    "//apps/cfm/api:onos-apps-cfm-api",
+]
+
+TEST_DEPS = TEST_ADAPTERS + [
+    "//utils/osgi:onlab-osgi-tests",
+]
+
+osgi_jar_with_tests(
+    test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/cfm/nbi/BUILD b/apps/cfm/nbi/BUILD
new file mode 100644
index 0000000..c28e664
--- /dev/null
+++ b/apps/cfm/nbi/BUILD
@@ -0,0 +1,19 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + REST + [
+    "//apps/cfm/api:onos-apps-cfm-api",
+]
+
+TEST_DEPS = TEST_REST + [
+    "//utils/osgi:onlab-osgi-tests",
+    "//web/api:onos-rest-tests",
+]
+
+osgi_jar_with_tests(
+    api_description = "REST API for L2 Monitoring CFM",
+    api_package = "org.onosproject.soam.rest",
+    api_title = "L2 Monitoring CFM",
+    api_version = "1.0",
+    exclude_tests = ["org/onosproject/cfm/impl/CfmResourceTest"],
+    test_deps = TEST_DEPS,
+    web_context = "/onos/cfm",
+    deps = COMPILE_DEPS,
+)