diff --git a/apps/openstackvtap/BUILD b/apps/openstackvtap/BUILD
new file mode 100644
index 0000000..fad480d
--- /dev/null
+++ b/apps/openstackvtap/BUILD
@@ -0,0 +1,15 @@
+BUNDLES = [
+    "//apps/openstackvtap/api:onos-apps-openstackvtap-api",
+    "//apps/openstackvtap/app:onos-apps-openstackvtap-app",
+]
+
+onos_app(
+    category = "Integration",
+    description = "SONA Openstack vTap Application.",
+    included_bundles = BUNDLES,
+    required_apps = [
+        "org.onosproject.openstacknetworking",
+    ],
+    title = "OpenStack vTap Application",
+    url = "https://wiki.onosproject.org/display/ONOS/SONA%3A+DC+Network+Virtualization",
+)
diff --git a/apps/openstackvtap/api/BUILD b/apps/openstackvtap/api/BUILD
new file mode 100644
index 0000000..36d2da1
--- /dev/null
+++ b/apps/openstackvtap/api/BUILD
@@ -0,0 +1,11 @@
+COMPILE_DEPS = CORE_DEPS
+
+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/openstackvtap/app/BUILD b/apps/openstackvtap/app/BUILD
new file mode 100644
index 0000000..078ed2b
--- /dev/null
+++ b/apps/openstackvtap/app/BUILD
@@ -0,0 +1,22 @@
+COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + REST + [
+    "//core/store/serializers:onos-core-serializers",
+    "//apps/openstacknetworking/api:onos-apps-openstacknetworking-api",
+    "//apps/openstacknode/api:onos-apps-openstacknode-api",
+    "//apps/openstackvtap/api:onos-apps-openstackvtap-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 = "OpenStack Network vTap REST API",
+    api_package = "org.onosproject.openstackvtap.web",
+    api_title = "OpenStack Network vTap REST API",
+    api_version = "1.0",
+    test_deps = TEST_DEPS,
+    web_context = "/onos/openstackvtap",
+    deps = COMPILE_DEPS,
+)