diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index fc12aeb..ffe852a 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -35,14 +35,14 @@
 
 olts:
   -
-    ip: '192.168.10.29'
+    ip: '192.168.10.75'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
     aggPort: '10'
-    serial: 'EC1917000121'
-    oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
-    oltDebVersion23: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
+    serial: 'EC1917000123'
+    oltDebVersion: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
 
 onus:
   -
@@ -57,7 +57,7 @@
       dp_iface_name: 'ens10'
       container_type: null
       container_name: null
-      olt: 'EC1917000121'
+      olt: 'EC1917000123'
       onu: 'ISKT71e82118'
       c_tag: '222'
       s_tag: '111'
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
new file mode 100644
index 0000000..ec7dc28
--- /dev/null
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -0,0 +1,98 @@
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for menlo-soak-pod
+
+---
+
+kube_config: '/home/cord/.kube/config'
+
+nodes:
+  -
+    ip: '10.128.90.90'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    ip: '192.168.100.44'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '31'
+    oltPort: '1'
+    device_id: 'of:0000000000000205'
+
+olts:
+  -
+    name: 'edgecore'
+    ip: '192.168.100.112'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    aggPort: '1'
+    serial: 'EC1721000208'
+    oltDebVersion: openolt_asfvolt16-2.4.6-5d9ab1a36e13e55ca3687af160cfd4f582317493.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
+
+onus:
+  -
+    serial: 'ALPHe3d1cf8e'
+  -
+    serial: 'ALPHe3d1cfe3'
+
+hosts:
+  src:
+    -
+      ip: '10.128.90.90'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens6f0'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cf8e'
+      olt: 'EC1721000208'
+      c_tag: '11'
+      s_tag: '111'
+    -
+      ip: '10.128.90.90'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens6f1'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cfe3'
+      olt: 'EC1721000208'
+      c_tag: '12'
+      s_tag: '111'
+  dst:
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.1.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.2.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
diff --git a/kubernetes-configs/onf-soak-pod.conf b/kubernetes-configs/onf-soak-pod.conf
new file mode 100644
index 0000000..db13c59
--- /dev/null
+++ b/kubernetes-configs/onf-soak-pod.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1EZ3lNVEl3TWpReU1Wb1hEVEk1TURneE9ESXdNalF5TVZvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBSzRPCjlhcGhPZHVHK29Ga2VqMzJQK21IbHQ1UmxGVG11YXpFSzZ3OG9YNHZuRk1XVGpqanZ0UDJCa05oL3I3bzhVY2UKY3ZFc1VMVGRUSGd3SWp2ekZRakZQL0VEKzR5MTlRRVhDZlIzeU1CVmNpd0FHdTNmRUZQbGtiRjlCWENlVzEzdgoxNHpLSTdMSEFCc0kvQXpMOEpHN0lZd3VMRFJzTm04MTZmWVNMZzB3eHJvRGlCYXJKZDJha0xPdUVVcnVTNjJJCll0aCtFQ015WWNMZGRBdGVXRmZ3NER5bDlWS2MrakFLQWVqR1NVeTBIU1YvNnBkWXB6Zk5Vd3JwVUU2V1VFbEwKaktUcFdoWlkzMGR5VHZIbjB2YzM0SzZ6czlwbmJOcmtaQ0o5MHdFcjV3UjJtZnZ4R2dSVzB6WUhVZGhoak1jbgpIQzlVTDlLY21WQWFuYkRJb2ZFQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHL1dZdXdBVzhmTGR1b2NNaU9XQUFuQ3MvVWYKTlBlaCtlWjVoSkFJYm9XVXVzVDd3RnJONE5RSkFPM0FpUDRjcHl3T1RLTEgyZTJYNjlyMVZqUkZERnpVR3c5VAp0eWcxb3lUTktSbjN0WXlYTFRNTU1GY3pqWFRpSlBGWWMyQ0VBNkNNdGFJTjI5Q0I4UzN3eFpJZmxoOWp3c2xnCjRQZ2t6OTU1czdHT0c2azZ2aW94cWNVL3hDNXU0VGNwa3hLM1A3VkFyMWdoZ3Y1WlJIazJobm5rcm84WUhpNU8KY0REU3BiUXU1alJ3akZQWXpveTdNaHZLVHVLUG5Ma0J2MUVnMjBGV3VjcHZSWDhoblcwbTlTODlhdlQ3U2RQMgplZ0c5ZXlya1ZiUTdlSHRZOW4vQ3ZEbXd2eTR3Yk56Wk1NSGhqUmFnb1Q2ZG02ZUpKdURJdVdqdld0WT0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://192.168.100.1:6443
+  name: kubernetes
+contexts:
+- context:
+    cluster: kubernetes
+    user: kubernetes-admin
+  name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJWTh5WXljell1L2d3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RBNE1qRXlNREkwTWpGYUZ3MHlNREE0TWpBeU1ESTBNakphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXoyTlNwazM5UGZPclZWYVcKTHlDSE94ckQ5emhRdkYzY0IzbmF6Z3E0cDgvTW01b0ZjTWYvMk8rVmdXOXo2bDBBdlFvVG9lUUZaOXhJa2k2OQpHR1VjQjZJMWo5K21XeTRIT0s2UDUzL1dubzlNak03aW95RGZZRVFHaFJRQy8xdzBxRFNleUU4dHNtSlF3THB3Ck10RXN2WUJxYm1sV0o1V1pEWmxUYjQ3V0cxeXRWc3ZlYkJEeW91WUpqemdmRFRLeEVZdXlUMGlreHRQc2g1bWkKRlpqZnVmbmQyQ3djdHE0UXlqMWMxMkJ0NEZZTHA4a0pVNXhNRTNONExsNHY4YjF2RGNqb0I0RHE3aElYL0daYwpLYWtXaEZOUUpOMUtpcVk5cFAyU2dSK01RQ3dhNTh2UlBtdkdibHkwb3pZZ0lVS0w5L3NCVkVFWmxZZStPS04vCkRCQ3Fvd0lEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFJT0NtWFdabm9YVUFuZVM5aUl5V0ErVnI5YkZwZ2xiaVFuWApOUUZoL3BadU9TOUs3ejc5M0JiWHI3NUZVK3FZOFpWNEVKWGgwQ0w2ai8ycWlWODJvaUxMOTN2NVFuT1luUGxoCmVZQkhnNXdaY25tQ2pRMHF4MWZ2aTRScDV6OFN3MTQvUzE5bWh1bzllZkszMjNnbndHeGVEbnNXM21hRUR4eW0KdjhOZ09yekhHRTBPQ1BKeVh5SWU1aUV6ZlFDMmpjVEJMMktXS3NSeXp0ZGlyenhrNWZqMk5kblhmeXVpRjB2SgpOWHkwZ08vUFBrcGJGYXZOc1V4d2VkZzVOai9LN2MydXRVcnZOMUxiWGhJZEwrelhoeEZvN0kzWlF3RVhjd0lFCm5Sa01RVXU1MFBON0ZsbnVDTzNyZ0YyN09oQW43TnFTcTNBU2ErUG5HbzE1WGdxRXZyND0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBejJOU3BrMzlQZk9yVlZhV0x5Q0hPeHJEOXpoUXZGM2NCM25hemdxNHA4L01tNW9GCmNNZi8yTytWZ1c5ejZsMEF2UW9Ub2VRRlo5eElraTY5R0dVY0I2STFqOSttV3k0SE9LNlA1My9Xbm85TWpNN2kKb3lEZllFUUdoUlFDLzF3MHFEU2V5RTh0c21KUXdMcHdNdEVzdllCcWJtbFdKNVdaRFpsVGI0N1dHMXl0VnN2ZQpiQkR5b3VZSmp6Z2ZEVEt4RVl1eVQwaWt4dFBzaDVtaUZaamZ1Zm5kMkN3Y3RxNFF5ajFjMTJCdDRGWUxwOGtKClU1eE1FM040TGw0djhiMXZEY2pvQjREcTdoSVgvR1pjS2FrV2hGTlFKTjFLaXFZOXBQMlNnUitNUUN3YTU4dlIKUG12R2JseTBvellnSVVLTDkvc0JWRUVabFllK09LTi9EQkNxb3dJREFRQUJBb0lCQVFDL1djQm5xK3Z1bm9iRwpuYmJDMHZ1VGdGV3lKR2J4OXBSTzNaTVNxM2ZIZG9jdVJ3V2dFeGt3MjVhUnIvay9GQUxiYVpIRnZQTno2aCtYCnFjSlY0T3prNmprTGYrc3BsQ1dibWcweko1UXFCc1ExNDZuZnBEUVd5WTFPZXJGdFZuRkxoZ20vZnJjR01ZcWEKMlNzdTZDdWt5ZmpwMlExaVJyaktnRjhvdnAwMDdqcEdDclZGR2hSQ1VLM3EzZ0NMRmtTaW9nMC9CUHBPYitTdQowY0dwZHBpSmMrSHFTeVdGVVRXTmFIS1E3alE2TkxJcko5ZWRSTGt0VVFiTG81c1FmWFJZSVl0MDJEOFNvUFVNCk12aGpjYnJtanFLTXJSbEF1Wjl2Ym9MbE5zZ3lBZFNTell5ajNwem9xQS9aUW5aTlRRazEvTUUrOUg3RlhtMEsKN3lZSk9DeHhBb0dCQU5ObUEyQ0hMOVVwS2ZtbmRyRWhZZVAvNDNHdFdOekUxWmpHcHp6WWUzTUMyTkpYN0V0agpZVytSOC8yQmFaMlBDNzdEVk5OTkNiZnMxLy95V294RE9MN2VLdktlMEUrK25XdkFWR2EweC93YW5ydXFRYmZrCklvaVpGd3NWMVZxMFZ6TksyRGZKOVZnT0JzNk1SSEhPU3ZycE1XVE5SbS9SVkp0TjdpK2tSTjI3QW9HQkFQc2sKc2dHRld4SDNqVzY4SzlqVXkxUUY1Yzhra1IzL2xvUGk3SFU4aWIvSEltdFY3UTFWbDBGcWE2eEZYR3M1L1N6KwpPQ3o2WWZlSXB0dUZpWGp1UUtqZEdkU2RNUkh6U3RSYkJxWUEyV2V6SjlmRUc3Z2VTcEg1cndSWU5lRU4zYVB2CnpWV2lza2c1OTM4VXg0WmVYZHc5NExOSzIvaU1zRFB4VjJqZFZ5UTVBb0dBVTVIY2UraDFiRnNka09nMjc4YzIKbjUrbEZtZGszY0dpZndicFRoQjJuUHpmSWloSDdYV1lLemNUc1gvYmRNSDc3cW5oZXJiVnhMUUluOUg3SWIvaApTdk1oSDFEUklQVkYzamJtSnNRSTJ3emErMjFQRlpkR1g2SEZqa2hQVTlBL09MTzV6alEwblY3T0toRWhiYXdUCjBDVW50YVhBMXF0Mk92OFB6aDJ1YThrQ2dZRUEyYTU3MEErcjJVM3VQQzVEL3lTcXZNQ0Q2ZUR6RzhKZXp5QVEKL3FramFLUU5OR1g5RzVLMWtSRFNGVGJsblZkZEYvT2Q4M1p2RmVSUFpIVkJyQjB1MUc4WXBZNCtheVdyRlpkMAprc3lucEZmSVVCLytPcitldVJwblZlZXpnOGZGOWdPendlZE1pb2diK3YyaTE5ZlJtVVhWRHZMeTZXUGdrcFU4Cnczc2V2aGtDZ1lFQW4vSE1XQWJvNy9WTkFQaXJYNTJRN0FQSitJZFVlcTVEeEFvNGhNK1FiSjRKZk56U1RydXMKdVltcDA4alMrYm4zQThWek5hSlY1ZUxIdDNHbVVLOHBVNGlONzR0ckhxRVBtNzRRUzYvdTFscUFkUlZYUEFCegpEOG4xajYrbUxrS1c0QWFJckFtdDd5emdjUmlUTmJobzBmUUgzSlVaVzRKNlMwNUM3bEZoRUdZPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/deployment-configs/onf-p4-demo-pod.yaml b/kubernetes-configs/onf-soak-pod.yml
similarity index 62%
rename from deployment-configs/onf-p4-demo-pod.yaml
rename to kubernetes-configs/onf-soak-pod.yml
index ffe6f15..7a2168c 100644
--- a/deployment-configs/onf-p4-demo-pod.yaml
+++ b/kubernetes-configs/onf-soak-pod.yml
@@ -1,3 +1,4 @@
+---
 # Copyright 2017-present Open Networking Foundation
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,28 +13,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# Automated deployment configuration for BBWF POD
+# Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
 
----
-
-kube_config: '/home/cord/.kube/config'
-
-nodes:
-  -
-    ip: '192.168.100.1'
-    user: 'cord'
-    pass: 'cord'
-
-fabric_switches:
-  -
-    ip: '192.168.100.22'
-    user: 'root'
-    pass: 'onl'
-
-olts:
-  -
-    name: 'edgecore'
-    ip: '192.168.100.112'
-    user: 'root'
-    pass: 'onl'
-    fortygig: 'true'
+application_logs: |
+  log4j.logger.org.opencord.olt = DEBUG
+  log4j.logger.org.opencord.kafka = DEBUG
+  log4j.logger.org.opencord.sadis = DEBUG
+  log4j.logger.org.opencord.aaa = DEBUG
+  log4j.logger.org.opencord.dhcpl2relay = DEBUG
diff --git a/kubernetes-configs/voltha/onf-soak-pod.yml b/kubernetes-configs/voltha/onf-soak-pod.yml
new file mode 100644
index 0000000..370da55
--- /dev/null
+++ b/kubernetes-configs/voltha/onf-soak-pod.yml
@@ -0,0 +1,43 @@
+---
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for ONF DEMO POD, olt/onu are connected to this
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base,hostprovider"
+
+application_logs: |
+  log4j.logger.org.opencord.olt = DEBUG
+  log4j.logger.org.opencord.kafka = DEBUG
+  log4j.logger.org.opencord.sadis = DEBUG
+  log4j.logger.org.opencord.aaa = DEBUG
+  log4j.logger.org.opencord.dhcpl2relay = DEBUG
diff --git a/tosca-configs/voltha/onf-soak-pod-onos-netcfg-switch.json b/tosca-configs/voltha/onf-soak-pod-onos-netcfg-switch.json
new file mode 100644
index 0000000..99c3bc5
--- /dev/null
+++ b/tosca-configs/voltha/onf-soak-pod-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+  "devices": {
+    "of:000000000000da7a" : {
+      "segmentrouting" : {
+        "name" : "Agg Switch",
+        "ipv4NodeSid" : 101,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}