diff --git a/apps/kafka-integration/BUILD b/apps/kafka-integration/BUILD
index c0b04d9..9077b7e 100644
--- a/apps/kafka-integration/BUILD
+++ b/apps/kafka-integration/BUILD
@@ -1,19 +1,17 @@
-# FIXME: Work in progress
-
 BUNDLES = [
-    "@kafka-clients//jar",
-    "@protobuf-java-3.2.0//jar",
+    "@kafka_clients//jar",
+    "@runtime_protobuf//jar",
     "//incubator/protobuf/models:onos-incubator-protobuf-models",
-    "//incubator/protobuf/models:onos-incubator-protobuf-models-proto",
+    "//incubator/protobuf/models/proto:onos-incubator-protobuf-models-proto",
     "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
     "//apps/kafka-integration/app:onos-apps-kafka-integration-app",
 ]
 
-#onos_app (
-#  title = "Kafka Integration",
-#  category = "Integration",
-#  url = "http://onosproject.org",
-#  description = "Provides integration of ONOS and Kafka message bus so that internal ONOS events " +
-#    "can be broadcast over the Kafka message bus to off-platform applications.",
-#  included_bundles = BUNDLES,
-#)
+onos_app(
+    category = "Integration",
+    description = "Provides integration of ONOS and Kafka message bus so that internal ONOS events " +
+                  "can be broadcast over the Kafka message bus to off-platform applications.",
+    included_bundles = BUNDLES,
+    title = "Kafka Integration",
+    url = "http://onosproject.org",
+)
diff --git a/apps/kafka-integration/app/BUILD b/apps/kafka-integration/app/BUILD
index d711987..2b39734 100644
--- a/apps/kafka-integration/app/BUILD
+++ b/apps/kafka-integration/app/BUILD
@@ -1,21 +1,20 @@
-# FIXME: Work in progress
-
 COMPILE_DEPS = CORE_DEPS + JACKSON + KRYO + CLI + [
     "//apps/kafka-integration/api:onos-apps-kafka-integration-api",
     "//core/store/serializers:onos-core-serializers",
     "@kafka_clients//jar",
-    "@protobuf-java-3.2.0//jar",
-    "//lib:GRPC_1.3",
+    "@javax_ws_rs_api//jar",
+    "//utils/rest:onlab-rest",
+    "@com_google_protobuf//:protobuf_java",
     "//incubator/protobuf/models:onos-incubator-protobuf-models",
-    "//incubator/protobuf/models:onos-incubator-protobuf-models-proto",
+    "//incubator/protobuf/models/proto:onos-incubator-protobuf-models-proto",
 ]
 
-#osgi_jar_with_tests (
-#    deps = COMPILE_DEPS,
-#    test_deps = TEST_ADAPTERS,
-#    web_context = "/onos/kafka-integration",
-#    api_title = "Kafka Integration",
-#    api_version = "1.0",
-#    api_description = "REST API for Kafka Integration",
-#    api_package = "org.onosproject.kafkaintegration.rest",
-#)
+osgi_jar_with_tests(
+    api_description = "REST API for Kafka Integration",
+    api_package = "org.onosproject.kafkaintegration.rest",
+    api_title = "Kafka Integration",
+    api_version = "1.0",
+    test_deps = TEST_ADAPTERS,
+    web_context = "/onos/kafka-integration",
+    deps = COMPILE_DEPS,
+)