diff --git a/apps/evpn-route-service/BUILD b/apps/evpn-route-service/BUILD
new file mode 100644
index 0000000..8ed33f3
--- /dev/null
+++ b/apps/evpn-route-service/BUILD
@@ -0,0 +1,11 @@
+BUNDLES = [
+    "//apps/evpn-route-service/api:onos-apps-evpn-route-service-api",
+    "//apps/evpn-route-service/app:onos-apps-evpn-route-service-app",
+]
+
+onos_app (
+    title = "EVPN Routing",
+    category = "Traffic Engineering",
+    url = "http://onosproject.org",
+    included_bundles = BUNDLES,
+)
diff --git a/apps/evpn-route-service/app/BUILD b/apps/evpn-route-service/app/BUILD
new file mode 100644
index 0000000..6786730
--- /dev/null
+++ b/apps/evpn-route-service/app/BUILD
@@ -0,0 +1,8 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + [
+    "//core/store/serializers:onos-core-serializers",
+    "//apps/evpn-route-service/api:onos-apps-evpn-route-service-api",
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/faultmanagement/BUILD b/apps/faultmanagement/BUILD
new file mode 100644
index 0000000..6f77dc4
--- /dev/null
+++ b/apps/faultmanagement/BUILD
@@ -0,0 +1,16 @@
+BUNDLES = [
+    "//apps/faultmanagement/fmcli:onos-apps-faultmanagement-fmcli",
+    "//apps/faultmanagement/fmgui:onos-apps-faultmanagement-fmgui",
+    "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
+    "//apps/faultmanagement/fmweb:onos-apps-faultmanagement-fmweb",
+]
+
+onos_app(
+    category = "Monitoring",
+    description = "Provides managements of alarms. Stores retrieved alarms from devices. " +
+        "Offers CLI, UI and REST integration to obtain and display them from ONOS.",
+    included_bundles = BUNDLES,
+    origin = "BTI Systems",
+    title = "Fault Management",
+    url = "https://wiki.onosproject.org/display/ONOS/Fault+Management",
+)
diff --git a/apps/faultmanagement/fmcli/BUILD b/apps/faultmanagement/fmcli/BUILD
new file mode 100644
index 0000000..98c61a8
--- /dev/null
+++ b/apps/faultmanagement/fmcli/BUILD
@@ -0,0 +1,10 @@
+COMPILE_DEPS = CORE_DEPS + [
+    "@org_apache_karaf_shell_console//jar",
+    "//incubator/api:onos-incubator-api",
+    "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
+    "//cli:onos-cli",
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/faultmanagement/fmgui/BUILD b/apps/faultmanagement/fmgui/BUILD
new file mode 100644
index 0000000..667b034
--- /dev/null
+++ b/apps/faultmanagement/fmgui/BUILD
@@ -0,0 +1,9 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + [
+    "//incubator/api:onos-incubator-api",
+    "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
+    "//cli:onos-cli",
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/faultmanagement/fmmgr/BUILD b/apps/faultmanagement/fmmgr/BUILD
new file mode 100644
index 0000000..9e95ac0
--- /dev/null
+++ b/apps/faultmanagement/fmmgr/BUILD
@@ -0,0 +1,8 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + [
+    "//incubator/api:onos-incubator-api",
+    "//core/store/serializers:onos-core-serializers",
+]
+
+osgi_jar_with_tests(
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/faultmanagement/fmweb/BUILD b/apps/faultmanagement/fmweb/BUILD
new file mode 100644
index 0000000..1f13858
--- /dev/null
+++ b/apps/faultmanagement/fmweb/BUILD
@@ -0,0 +1,16 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + [
+    "@javax_ws_rs_api//jar",
+    "//incubator/api:onos-incubator-api",
+    "//apps/faultmanagement/fmmgr:onos-apps-faultmanagement-fmmgr",
+    "//utils/rest:onlab-rest",
+]
+
+osgi_jar_with_tests(
+    api_description = "REST API for Fault Management",
+    api_package = "org.onosproject.faultmanagement",
+    api_title = "Fault Management Rest API",
+    api_version = "/onos/v1/fm",
+    test_deps = TEST_ADAPTERS,
+    web_context = "/onos/dhcp",
+    deps = COMPILE_DEPS,
+)
diff --git a/modules.bzl b/modules.bzl
index c47d449..c5eaf50 100644
--- a/modules.bzl
+++ b/modules.bzl
@@ -196,7 +196,7 @@
     #"//apps/routing/cpr:onos-apps-routing-cpr-oar",
     #"//apps/routing/fpm:onos-apps-routing-fpm-oar",
     #"//apps/vtn:onos-apps-vtn-oar",
-    #"//apps/faultmanagement:onos-apps-faultmanagement-oar",
+    "//apps/faultmanagement:onos-apps-faultmanagement-oar",
     #"//apps/openstacknode:onos-apps-openstacknode-oar",
     #"//apps/cpman/app:onos-apps-cpman-app-oar",
     #"//apps/scalablegateway:onos-apps-scalablegateway-oar",
@@ -226,7 +226,7 @@
     #"//apps/gluon:onos-apps-gluon-oar",
     #"//apps/evpnopenflow:onos-apps-evpnopenflow-oar",
     "//apps/route-service:onos-apps-route-service-oar",
-    #"//apps/evpn-route-service:onos-apps-evpn-route-service-oar",
+    "//apps/evpn-route-service:onos-apps-evpn-route-service-oar",
     #"//incubator/protobuf/registry:onos-incubator-protobuf-registry-oar",
     #"//incubator/protobuf/services/nb:onos-incubator-protobuf-services-nb-oar",
     #"//apps/openstacknetworkingui:onos-apps-openstacknetworkingui-oar",