diff --git a/apps/tetunnel/BUILD b/apps/tetunnel/BUILD
index bac5864..9467b00 100644
--- a/apps/tetunnel/BUILD
+++ b/apps/tetunnel/BUILD
@@ -1,4 +1,5 @@
 BUNDLES = [
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//apps/tetunnel/api:onos-apps-tetunnel-api",
     "//apps/tetunnel/app:onos-apps-tetunnel-app",
 ]
diff --git a/apps/tetunnel/api/BUILD b/apps/tetunnel/api/BUILD
index 1fb7f05..0d45477 100644
--- a/apps/tetunnel/api/BUILD
+++ b/apps/tetunnel/api/BUILD
@@ -1,6 +1,6 @@
 COMPILE_DEPS = CORE_DEPS + [
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//apps/tetopology/api:onos-apps-tetopology-api",
-    "//incubator/api:onos-incubator-api",
 ]
 
 osgi_jar_with_tests(
diff --git a/apps/tetunnel/app/BUILD b/apps/tetunnel/app/BUILD
index 17f4c6b..d5a367e 100644
--- a/apps/tetunnel/app/BUILD
+++ b/apps/tetunnel/app/BUILD
@@ -1,13 +1,13 @@
 COMPILE_DEPS = CORE_DEPS + KRYO + [
     "//apps/tetopology/api:onos-apps-tetopology-api",
     "//apps/tetunnel/api:onos-apps-tetunnel-api",
-    "//incubator/api:onos-incubator-api",
+    "//apps/tunnel/api:onos-apps-tunnel-api",
     "//core/store/serializers:onos-core-serializers",
 ]
 
 TEST_DEPS = TEST_ADAPTERS + [
     "//utils/osgi:onlab-osgi-tests",
-    "//incubator/api:onos-incubator-api-tests",
+    "//apps/tunnel/api:onos-apps-tunnel-api-tests",
 ]
 
 osgi_jar_with_tests(