diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e14594c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.log
+local_imports
diff --git a/Dockerfile.voltha-onos b/Dockerfile.voltha-onos
index a19f414..b6d1047 100644
--- a/Dockerfile.voltha-onos
+++ b/Dockerfile.voltha-onos
@@ -34,7 +34,7 @@
 
 
 # Unpack and install specific apps from download stage
-FROM onosproject/onos:1.13.5 as install
+FROM onosproject/onos:1.13.9 as install
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
@@ -55,7 +55,7 @@
 
 
 # Create the final image coping over the installed applications from the install stage
-FROM onosproject/onos:1.13.5
+FROM onosproject/onos:1.13.9
 
 # The ENV settings must be replicated below as they are not shared between stages
 ENV ONOS=/root/onos
diff --git a/Makefile b/Makefile
index d54f4f4..dc782eb 100644
--- a/Makefile
+++ b/Makefile
@@ -59,6 +59,7 @@
 local-onosapps:
 	mkdir -p local_imports/oar
 ifdef LOCAL_ONOSAPPS
+	rm -rf local_imports/oar
 	./get-local-oars.sh
 endif
 
diff --git a/dependencies.xml b/dependencies.xml
index 2d5a52c..1b8b995 100644
--- a/dependencies.xml
+++ b/dependencies.xml
@@ -24,10 +24,11 @@
     <version>fake</version>
 
     <properties>
-        <olt.version>2.1.0</olt.version>
-        <sadis.version>2.2.0</sadis.version>
-        <aaa.version>1.8.0</aaa.version>
-        <dhcpl2relay.version>1.5.0</dhcpl2relay.version>
+        <olt.version>3.0.1</olt.version>
+        <sadis.version>3.1.0</sadis.version>
+        <aaa.version>1.9.0</aaa.version>
+        <dhcpl2relay.version>1.6.0</dhcpl2relay.version>
+        <kafka.version>1.1.0</kafka.version>
     </properties>
 
     <build>
@@ -54,18 +55,25 @@
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.opencord</groupId>
-                            <artifactId>aaa</artifactId>
+                            <artifactId>aaa-app</artifactId>
                             <version>${aaa.version}</version>
                             <type>oar</type>
                             <overWrite>true</overWrite>
                         </artifactItem>
                         <artifactItem>
                             <groupId>org.opencord</groupId>
-                            <artifactId>dhcpl2relay</artifactId>
+                            <artifactId>dhcpl2relay-app</artifactId>
                             <version>${dhcpl2relay.version}</version>
                             <type>oar</type>
                             <overWrite>true</overWrite>
                         </artifactItem>
+                        <artifactItem>
+                            <groupId>org.opencord</groupId>
+                            <artifactId>kafka</artifactId>
+                            <version>${kafka.version}</version>
+                            <type>oar</type>
+                            <overWrite>true</overWrite>
+                        </artifactItem>
                     </artifactItems>
                 </configuration>
             </plugin>
diff --git a/get-local-oars.sh b/get-local-oars.sh
index f74cb2c..70fdc73 100755
--- a/get-local-oars.sh
+++ b/get-local-oars.sh
@@ -19,6 +19,7 @@
 mkdir -p local_imports/oar
 cp ../olt/app/target/*.oar local_imports/oar/
 cp ../sadis/app/target/*.oar local_imports/oar/
-cp ../aaa/target/*.oar local_imports/oar/
-cp ../dhcpl2relay/target/*.oar local_imports/oar/
+cp ../aaa/app/target/*.oar local_imports/oar/
+cp ../dhcpl2relay/app/target/*.oar local_imports/oar/
+cp ../kafka-onos/target/*.oar local_imports/oar/
 
diff --git a/network-cfg-example.json b/network-cfg-example.json
index 4953482..a839211 100644
--- a/network-cfg-example.json
+++ b/network-cfg-example.json
@@ -16,6 +16,11 @@
         "useOltUplinkForServerPktInOut": true
       }
     },
+    "org.opencord.kafka": {
+      "kafka": {
+        "bootstrapServers": "172.17.0.1:9092"
+      }
+    },
     "org.opencord.aaa": {
       "AAA": {
         "radiusIp": "172.17.0.1",
@@ -48,15 +53,62 @@
             "sTag": 900,
             "nasPortId": "BBSM00000001-1",
             "circuitId": "BBSM00000001-1",
-            "remoteId": "BBSIMOLT000"
+            "remoteId": "BBSIMOLT000",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
           },
           {
-            "id": "BBSM00000002-1",
-            "cTag": 901,
-            "sTag": 901,
-            "nasPortId": "BBSM00000002-1",
-            "circuitId": "BBSM00000002-1",
-            "remoteId": "BBSIMOLT000"
+            "id": "BBSM00000001-2",
+            "cTag": 900,
+            "sTag": 900,
+            "nasPortId": "BBSM00000001-2",
+            "circuitId": "BBSM00000001-2",
+            "remoteId": "BBSIMOLT000",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "BBSM00000001-3",
+            "cTag": 900,
+            "sTag": 900,
+            "nasPortId": "BBSM00000001-3",
+            "circuitId": "BBSM00000001-3",
+            "remoteId": "BBSIMOLT000",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          },
+          {
+            "id": "BBSM00000001-4",
+            "cTag": 900,
+            "sTag": 900,
+            "nasPortId": "BBSM00000001-4",
+            "circuitId": "BBSM00000001-4",
+            "remoteId": "BBSIMOLT000",
+            "technologyProfileId": 64,
+            "upstreamBandwidthProfile": "Default",
+            "downstreamBandwidthProfile": "Default"
+          }
+        ]
+      },
+      "bandwidthprofile": {
+        "integration": {
+          "cache": {
+            "enabled": true,
+            "maxsize": 40,
+            "ttl": "PT1m"
+          }
+        },
+        "entries": [
+          {
+            "id": "Default",
+            "cir": 1000000,
+            "cbs": 1001,
+            "eir": 1002,
+            "ebs": 1003,
+            "air": 1004
           }
         ]
       }