diff --git a/apps/t3/BUILD b/apps/t3/BUILD
new file mode 100644
index 0000000..0e444bf
--- /dev/null
+++ b/apps/t3/BUILD
@@ -0,0 +1,19 @@
+BUNDLES = [
+    "//apps/t3/web:onos-apps-t3-web",
+    "//apps/t3/app:onos-apps-t3-app",
+]
+
+onos_app(
+    app_name = "org.onosproject.t3",
+    category = "Utilities",
+    description = "Provides static analysis of flows and groups " +
+                  "to determine the possible paths a packet may take.",
+    included_bundles = BUNDLES,
+    required_apps = [
+        "org.onosproject.segmentrouting",
+        "org.onosproject.route-service",
+        "org.onosproject.mcast",
+    ],
+    title = "Trellis Troubleshooting Toolkit",
+    url = "https://wiki.opencord.org/pages/viewpage.action?pageId=4456974",
+)
diff --git a/apps/t3/app/BUILD b/apps/t3/app/BUILD
new file mode 100644
index 0000000..4380cd6
--- /dev/null
+++ b/apps/t3/app/BUILD
@@ -0,0 +1,18 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + JACKSON + CLI + [
+    "//core/store/serializers:onos-core-serializers",
+    "//core/store/primitives:onos-core-primitives",
+    "//drivers/default:onos-drivers-default",
+    "//apps/segmentrouting/app:onos-apps-segmentrouting-app",
+    "//apps/route-service/api:onos-apps-route-service-api",
+    "//apps/mcast/api:onos-apps-mcast-api",
+]
+
+TEST_DEPS = TEST_ADAPTERS + [
+    "//utils/misc:onlab-misc",
+    "//apps/route-service/api:onos-apps-route-service-api-tests",
+]
+
+osgi_jar_with_tests(
+    test_deps = TEST_DEPS,
+    deps = COMPILE_DEPS,
+)
diff --git a/apps/t3/web/BUILD b/apps/t3/web/BUILD
new file mode 100644
index 0000000..0fd733f
--- /dev/null
+++ b/apps/t3/web/BUILD
@@ -0,0 +1,13 @@
+COMPILE_DEPS = CORE_DEPS + KRYO + JACKSON + REST + CLI + [
+    "@jersey_server//jar",
+    "//apps/t3/app:onos-apps-t3-app",
+]
+
+osgi_jar(
+    api_description = "REST API for T3",
+    api_package = "org.onosproject.t3.rest",
+    api_title = "T3 REST API",
+    api_version = "1.0",
+    web_context = "/onos/v1/t3",
+    deps = COMPILE_DEPS,
+)