diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 3443c6c..310fa37 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -40,8 +40,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -60,7 +60,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0.11'
@@ -73,7 +73,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1.12'
@@ -90,7 +90,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip:10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f0
@@ -103,7 +103,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip:10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f0
diff --git a/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index f6751c1..7a523df 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -35,8 +35,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -54,7 +54,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0'
@@ -67,7 +67,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1'
@@ -84,7 +84,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip:10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
@@ -97,7 +97,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip:10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index f6751c1..7a523df 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -35,8 +35,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -54,7 +54,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0'
@@ -67,7 +67,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1'
@@ -84,7 +84,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip:10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
@@ -97,7 +97,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip:10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
diff --git a/tosca-configs/att-workflow/bbwf-adtran-olt.yaml b/tosca-configs/att-workflow/bbwf-adtran-olt.yaml
deleted file mode 100755
index 944d903..0000000
--- a/tosca-configs/att-workflow/bbwf-adtran-olt.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-# 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.
-
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @bbwf-adtran-olt.yaml http://192.168.100.1:30007/run
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
-  - custom_types/oltdevice.yaml
-  - custom_types/onudevice.yaml
-  - custom_types/voltservice.yaml
-description: Creates OLT devices
-topology_template:
-  node_templates:
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      properties:
-        name: volt
-        must-exist: true
-
-    adtran:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: Adtran OLT
-        device_type: adtran_olt
-        host: 192.168.100.112
-        port: 830
-        switch_datapath_id: of:0000000000000001
-        switch_port: "50"
-        outer_tpid: "0x8100"
-        uplink: "1"
-        nas_id: "NAS_ID"
-        serial_number: "LBADTN1826AC658"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
deleted file mode 100755
index ae00a8b..0000000
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ /dev/null
@@ -1,115 +0,0 @@
-# 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.
-
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @bbwf-olt.yaml http://192.168.100.1:30007/run
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
-  - custom_types/oltdevice.yaml
-  - custom_types/onudevice.yaml
-  - custom_types/voltservice.yaml
-description: Creates OLT devices
-topology_template:
-  node_templates:
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      properties:
-        name: volt
-        must-exist: true
-
-    edgecore:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: EdgeCore OLT
-        device_type: openolt
-        host: 192.168.100.111
-        port: 9191
-        switch_datapath_id: of:0000000000000001
-        switch_port: "49"
-        outer_tpid: "0x8100"
-        uplink: "65536"
-        nas_id: "NAS_ID"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-    # adtran:
-    #   type: tosca.nodes.OLTDevice
-    #   properties:
-    #     name: Adtran OLT
-    #     device_type: adtran_olt
-    #     host: 192.168.100.112
-    #     port: 830
-    #     switch_datapath_id: of:0000000000000001
-    #     switch_port: "50"
-    #     outer_tpid: "0x8100"
-    #     uplink: "1"
-    #     nas_id: "NAS_ID"
-    #   requirements:
-    #     - volt_service:
-    #         node: service#volt
-    #         relationship: tosca.relationships.BelongsToOne
-
-    cig:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: CIG OLT
-        device_type: openolt
-        host: 192.168.100.113
-        port: 10400
-        switch_datapath_id: of:0000000000000001
-        switch_port: "51"
-        outer_tpid: "0x8100"
-        uplink: "65536"
-        nas_id: "NAS_ID"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-    # iskratel-xgspon:
-    #   type: tosca.nodes.OLTDevice
-    #   properties:
-    #     name: Iskratel XGS-PON OLT
-    #     device_type: openolt
-    #     host: 192.168.100.114
-    #     port: 9191
-    #     switch_datapath_id: of:0000000000000001
-    #     switch_port: "46"
-    #     outer_tpid: "0x8100"
-    #     uplink: "65536"
-    #     nas_id: "NAS_ID"
-    #   requirements:
-    #     - volt_service:
-    #         node: service#volt
-    #         relationship: tosca.relationships.BelongsToOne
-
-    iskratel-gpon:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: Iskratel GPON OLT
-        device_type: openolt
-        host: 192.168.100.115
-        port: 9191
-        switch_datapath_id: of:0000000000000001
-        switch_port: "47"
-        outer_tpid: "0x8100"
-        uplink: "65536"
-        nas_id: "NAS_ID"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onf-p4-demo-pod-olt.yaml b/tosca-configs/att-workflow/onf-p4-demo-pod-olt.yaml
deleted file mode 100644
index 7bb664e..0000000
--- a/tosca-configs/att-workflow/onf-p4-demo-pod-olt.yaml
+++ /dev/null
@@ -1,112 +0,0 @@
-# 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.
-
-# curl -H "xos-username: admin@opencord.org" -H "xos-password: letmein" -X POST --data-binary @onf-p4-demo-pod-olt.yaml http://192.168.100.1:30007/run
-
-tosca_definitions_version: tosca_simple_yaml_1_0
-imports:
-  - custom_types/oltdevice.yaml
-  - custom_types/onudevice.yaml
-  - custom_types/voltservice.yaml
-  - custom_types/technologyprofile.yaml
-
-description: Creates OLT devices
-topology_template:
-  node_templates:
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      properties:
-        name: volt
-        must-exist: true
-
-    edgecore:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: EdgeCore OLT
-        device_type: openolt
-        host: 192.168.100.112
-        port: 9191
-        switch_datapath_id: of:0000000000000205
-        switch_port: "1"
-        outer_tpid: "0x8100"
-        uplink: "65536"
-        nas_id: "NAS_ID"
-        serial_number: "EC1721000208"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-    technologyProfile:
-      type: tosca.nodes.TechnologyProfile
-      properties:
-        profile_id: 64
-        technology: xgspon
-        profile_value: >
-          {
-            "name": "4QueueHybridProfileMap1",
-            "profile_type": "XPON",
-            "version": 1.0,
-            "num_gem_ports": 1,
-            "instance_control": {
-              "onu": "multi-instance",
-              "uni": "single-instance",
-              "max_gem_payload_size": "auto"
-            },
-            "us_scheduler": {
-              "additional_bw": "auto",
-              "direction": "UPSTREAM",
-              "priority": 0,
-              "weight": 0,
-              "q_sched_policy": "hybrid"
-            },
-            "ds_scheduler": {
-              "additional_bw": "auto",
-              "direction": "DOWNSTREAM",
-              "priority": 0,
-              "weight": 0,
-              "q_sched_policy": "hybrid"
-            },
-            "upstream_gem_port_attribute_list": [{
-                "pbit_map": "0b11111111",
-                "aes_encryption": "True",
-                "scheduling_policy": "StrictPriority",
-                "priority_q": 1,
-                "weight": 0,
-                "discard_policy": "TailDrop",
-                "max_q_size": "auto",
-                "discard_config": {
-                  "min_threshold": 0,
-                  "max_threshold": 0,
-                  "max_probability": 0
-                }
-              }
-            ],
-            "downstream_gem_port_attribute_list": [{
-                "pbit_map": "0b11111111",
-                "aes_encryption": "True",
-                "scheduling_policy": "StrictPriority",
-                "priority_q": 1,
-                "weight": 0,
-                "discard_policy": "TailDrop",
-                "max_q_size": "auto",
-                "discard_config": {
-                  "min_threshold": 0,
-                  "max_threshold": 0,
-                  "max_probability": 0
-                }
-              }
-            ]
-          }