diff --git a/apps/openstacktroubleshoot/BUILD b/apps/openstacktroubleshoot/BUILD
new file mode 100644
index 0000000..c7f776f
--- /dev/null
+++ b/apps/openstacktroubleshoot/BUILD
@@ -0,0 +1,13 @@
+BUNDLES = [
+    "//apps/openstacktroubleshoot/api:onos-apps-openstacktroubleshoot-api",
+    "//apps/openstacktroubleshoot/app:onos-apps-openstacktroubleshoot-app",
+]
+
+onos_app(
+    category = "Integration",
+    description = "SONA Openstack Troubleshoot Application.",
+    included_bundles = BUNDLES,
+    required_apps = ["org.onosproject.openstacknetworking"],
+    title = "OpenStack Troubleshoot",
+    url = "http://onosproject.org",
+)
diff --git a/apps/openstacktroubleshoot/api/BUILD b/apps/openstacktroubleshoot/api/BUILD
new file mode 100644
index 0000000..b22d9f6
--- /dev/null
+++ b/apps/openstacktroubleshoot/api/BUILD
@@ -0,0 +1,11 @@
+COMPILE_DEPS = CORE_DEPS + CLI
+
+TEST_DEPS = TEST_ADAPTERS + [
+    "//core/api:onos-api-tests",
+    "//core/common:onos-core-common-tests",
+]
+
+osgi_jar_with_tests(
+    test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/openstacktroubleshoot/app/BUILD b/apps/openstacktroubleshoot/app/BUILD
new file mode 100644
index 0000000..3c979d2
--- /dev/null
+++ b/apps/openstacktroubleshoot/app/BUILD
@@ -0,0 +1,19 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + REST + [
+    "//apps/openstacktroubleshoot/api:onos-apps-openstacktroubleshoot-api",
+]
+
+TEST_DEPS = TEST_ADAPTERS + TEST_REST + [
+    "//core/api:onos-api-tests",
+    "//core/common:onos-core-common-tests",
+    "//web/api:onos-rest-tests",
+]
+
+osgi_jar_with_tests(
+    api_description = "REST API for OpenStack Troubleshoot",
+    api_package = "org.onosproject.openstacktroubleshoot.web",
+    api_title = "OpenStack Troubleshoot API",
+    api_version = "1.0",
+    test_deps = TEST_DEPS,
+    web_context = "/onos/openstacktroubleshoot",
+    deps = COMPILE_DEPS,
+)