diff --git a/deployment-configs/flex-pod1-olt-voltha16.yaml b/deployment-configs/flex-pod1-olt-voltha16.yaml
new file mode 100644
index 0000000..f8d0d23
--- /dev/null
+++ b/deployment-configs/flex-pod1-olt-voltha16.yaml
@@ -0,0 +1,68 @@
+# 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 Flex POD 1 , olt/onu are connected to this
+
+---
+
+kube_config: 'flex-pod1-olt-voltha16.conf'
+
+nodes:
+  -
+    ip: '10.192.4.241'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.4.242'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.4.243'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.4.244'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:5b:6d:a8'
+    ip: '10.192.4.217'
+    user: 'root'
+    pass: 'onl'
+
+olts:
+  -
+    ip: '10.192.4.206'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+
+hosts:
+  src:
+    ip: '10.192.4.61'
+    user: 'cluser'
+    pass: 'cloudlabs'
+    dp_iface_name: 'enp4s0f1'
+    dp_iface_ip: '10.8.2.1'
+    dp_iface_gateway: '10.8.2.254'
+  dst:
+    ip: '10.192.4.62'
+    user: 'cord'
+    pass: 'cord'
+    dp_iface_name: 'ens3'
+    dp_iface_ip_qinq: '10.8.2.100'
+    dp_iface_ip: '10.8.3.1'
+    dp_iface_gateway: '10.8.3.254'
diff --git a/kubernetes-configs/flex-pod1-olt-voltha16.conf b/kubernetes-configs/flex-pod1-olt-voltha16.conf
new file mode 100644
index 0000000..ad8d871
--- /dev/null
+++ b/kubernetes-configs/flex-pod1-olt-voltha16.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+kind: Config
+current-context: admin-cluster.local
+preferences: {}
+clusters:
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM5ekNDQWQrZ0F3SUJBZ0lKQUlJVytOSWVGbkc4TUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0hoY05NVGd3TmpFeE1qRTBOVE0xV2hjTk5EVXhNREkzTWpFME5UTTFXakFTTVJBdwpEZ1lEVlFRRERBZHJkV0psTFdOaE1JSUJJakFOQmdrcWhraUc5dzBCQVFFRkFBT0NBUThBTUlJQkNnS0NBUUVBCnVBaFNSWlBpU1Yxb1hDMUVlYk5xTzlxL3lkK0x6RDdleEZkOVNOcFI1aDZKOFZ5R2VickgzUjJEMHhOZEN4eVcKY09yWUxWZVpwNkF3M01jRGpkc0I5dTU4bW5pc3U1cm1KcjhJeVR6ZUl1UGJCa25ITzc3eDVjb09Rb014aHZGWQpSRmN6TjFoTGxqYVBFODlaazBDV2dyWmUxVHFyRWNJSlNQUDdvY3hCYU05NTU4MC82czNBc0d2YVFWZlR0ckhlCk5jcWFrYUxEWmtBeTRmQlllWmVPS0Zick53WERJUno0YjdZS2E0ODdrV1BZTVNReWVhSTB6WjlTeTEzTDBGbmUKbmxJcTZTc2Q4aHMxOUY0S0pJdU5XWjBjV2VpdUdYTnprVEoremplZW1Zc3JvOHI4QmV1VHNkdi9EN01oL1prTApFZWVEVjN5KzlPZGV3b2dpRjFobHd3SURBUUFCbzFBd1RqQWRCZ05WSFE0RUZnUVVBVlhFNDJrTVk0ZHRwaEFaCk5jTkEwNnZNakdFd0h3WURWUjBqQkJnd0ZvQVVBVlhFNDJrTVk0ZHRwaEFaTmNOQTA2dk1qR0V3REFZRFZSMFQKQkFVd0F3RUIvekFOQmdrcWhraUc5dzBCQVFzRkFBT0NBUUVBQkZZRDhIMEVHR1JmdUVTWU4veW5SZldtTERVSgpZWFZuUHh3OVFjSXRFLzdNQkZ1R1JyQkpiUXVaUVovb3ljSHo0eGYwTTdxd3EwSzkxQjF0MkpsODhKUEloM1g0CnJkTjdRRk9ST2l2NS9wcU14cTNiQVhGZUlJTi9ROXVQd21GY3ZFcDJ3dGJ4R214LzMvYldGOG96Y1pKVmtYajQKZW1hMlN1OXlla2RKYjNWbXJ5TU9kVTEvbmc1YUlFSm90L0tlZFBEQ0JTem9uTU80R08xWkR2dGNaQzdzUXRaQwpZVTg1WnlPZnN5dXBiU0ZmS3BoYyttZldsYldQUjI4V2UxaHpJakFaVW5jczdOMkJuRElCaEdoamtYSXZZb1BqCis4Q1hhMytGTkNDQy9hejUzcWMxODk0ZnRhQllZQmpuYm15UTVUMTZKeEtYUk5LeTdzc2lUOUlpU0E9PQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    server: https://10.192.4.241:6443
+  name: cluster.local
+contexts:
+- context:
+    cluster: cluster.local
+    user: admin-cluster.local
+  name: admin-cluster.local
+users:
+- name: admin-cluster.local
+  user:
+    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURqakNDQW5hZ0F3SUJBZ0lKQU5HVjRhbzdpdXBPTUEwR0NTcUdTSWIzRFFFQkN3VUFNQkl4RURBT0JnTlYKQkFNTUIydDFZbVV0WTJFd0hoY05NVGd3TmpFeE1qRTBOVE0xV2hjTk1qZ3dOakE0TWpFME5UTTFXakEwTVJrdwpGd1lEVlFRRERCQnJkV0psTFdGa2JXbHVMVzV2WkdVeE1SY3dGUVlEVlFRS0RBNXplWE4wWlcwNmJXRnpkR1Z5CmN6Q0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQU5IQVArUDI0RTFxUDRXQ1FXWGUKU2NoZzBGZEtWSWoxQS9nL01FZTJUSlJmMVJDWUp6azhJTHo1bFJsRDVFL1VhaGdjT0RwSks5VGhuWW1pUjRJWgo1dFBLT0EyTVBGM3lvQW16eUpzTTV5SGpUQXN2OWYzWVRva2h3TFVCQUwvMVA2dDJlSUtEdjltdTBZWkhTYTROCm1OTWkxclFMZmVaSWtVamw0Qmp6dUZOeklvK3lKT003TkNUeWlwVzU5R0hpT1VjRW5XZmhxTHNxaERoanhOVFEKRjM5UWVLYnhJQ00yQWR4dVZXMmxYQmhDakFWU0FoTm1sYUliRDJQdCtjQ2NwZmhocTd0Y1NHWFBCMVhYR0F6SgpEMU92NElPM3dJS29RQ1Q4TzVtenQvWEFDeWJWSFRuRFYrdDFuMlpJMGNUdFlFRVJLN0t6bG5ub3UxRmZkdDBlCm9BTUNBd0VBQWFPQnhEQ0J3VEFKQmdOVkhSTUVBakFBTUFzR0ExVWREd1FFQXdJRjREQ0JwZ1lEVlIwUkJJR2UKTUlHYmdncHJkV0psY201bGRHVnpnaEpyZFdKbGNtNWxkR1Z6TG1SbFptRjFiSFNDRm10MVltVnlibVYwWlhNdQpaR1ZtWVhWc2RDNXpkbU9DSkd0MVltVnlibVYwWlhNdVpHVm1ZWFZzZEM1emRtTXVZMngxYzNSbGNpNXNiMk5oCmJJSUpiRzlqWVd4b2IzTjBnZ1Z1YjJSbE1ZSUZibTlrWlRLSEJBckFCUEdIQkFyQUJQR0hCQXJBQlBLSEJBckEKQlBLSEJBcnBBQUdIQkg4QUFBRXdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQm1pVVh0eW5WRzFEdVQzWUxoMwo5ZkZ4cWZFdS9GdWR2dUFyNmhrYS9QSmVDYllYRVR3T0ZBb3M5Tll5b1h2Ujd6TExGWlkxdnhONHFDN3pkcG5SCmVXSGUrV0J5SEdUZGY2aXM3R0Vmc1pZZU5HV0RIak93cmc4bzAxYm1zbE1WeWw4TWpOS2pKUk93KzcvMSt4MnQKU0F1VXBHTDZmTFlHd3V1dUtsV3g5YVY0d2RnMGtrTitiOEI1UGltTjZaNFVrRFJNTlVNUmpDV3ZWendXWjVncQpuK0FqbVVGS1BUZks2cjFxMG9uRUtjVlJhaGtKOEFBdC9PWmVLR3pJOVRDeUJzWk00aHdmU2FuaEVGZ292OCt2CmM5SVJXMDdjaHQzNTEvNGptZWZFSkFGZVJ3RlgwYzFncVVWU3hITG9LcUwwQkU4Q3dQNmdzaXcySTZKRHdleWEKK1FNPQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFb3dJQkFBS0NBUUVBMGNBLzQvYmdUV28vaFlKQlpkNUp5R0RRVjBwVWlQVUQrRDh3UjdaTWxGL1ZFSmduCk9Ud2d2UG1WR1VQa1Q5UnFHQnc0T2trcjFPR2RpYUpIZ2hubTA4bzREWXc4WGZLZ0NiUEltd3puSWVOTUN5LzEKL2RoT2lTSEF0UUVBdi9VL3EzWjRnb08vMmE3UmhrZEpyZzJZMHlMV3RBdDk1a2lSU09YZ0dQTzRVM01pajdJawo0enMwSlBLS2xibjBZZUk1UndTZForR291eXFFT0dQRTFOQVhmMUI0cHZFZ0l6WUIzRzVWYmFWY0dFS01CVklDCkUyYVZvaHNQWSszNXdKeWwrR0dydTF4SVpjOEhWZGNZRE1rUFU2L2dnN2ZBZ3FoQUpQdzdtYk8zOWNBTEp0VWQKT2NOWDYzV2Zaa2pSeE8xZ1FSRXJzck9XZWVpN1VWOTIzUjZnQXdJREFRQUJBb0lCQUJoenFQOFNVS08xdHlJQgpSVTV5MDNjZ2tpa2E2Uy91SUVCWVhYQit0LzYwRFVxWjhqaWg0YzhsNlZQQXJtVUFCajQ1Uy9TL2d2U1dPSjlLCjQ3c3UrZEhHeVRJTEh4NTBvbU4vS2V1cFhXaDk3dWQrOTlaWDJRL3pkMXVpZWt2bWN6MngyZXFkSVVobk1OWE8KaWJCWXRYQW5wNC9scHcrcGRnWmhoZlppc3lKSEc0R2tVOEdQWDZ3T0lLTGZvUVlYRWNac1ZWRWE4b3pYVGZOUworSFFYTDZCa2Q3ZmlCV1JSQnJaSjN0Mjcvb1pwWlRpY2lVWVhoeGhlc2xCN2JZcUluR3VQMU9sYjBnSGprTWxhCnZTWGt1Wmgza2VUWHhiM0NqN0gyTGJIN3paMWRwNERDRWVSaWlNY2hnMWJhL2gwZ29QMUtRUEQ2Uk9IVFp3UTcKUFlNamhnRUNnWUVBL3d0T21lb29JRVBrczExeUthUXZMcUE3RWdnRFRlNi9WMnJUSUczdzYvYjI1QjhIS3VEcApVbThiZHh0VE5VdGRzSmxLZExJcGZvaFJSU0k5OVJRbUR5WnJsajRMY3hQUXJHTHlZVzA4OUJ1UEN3MjVPMWIzCmZmOVVWMFpFb3hadm1JY0JZT0V0TFBxb213SGFaeFJtS09VTmNFVWMwaVlSWk03YTloT28wS01DZ1lFQTBvbDgKMC9UeTNtdHl2a0duWEJ1RXE5ZGV1dWhOdncrajZTbS9iVFpkVFpjNWFMRGVoY3p3NkFMaUcvMC94OU5VaElDYwppRExXUDVUbkwrRkN0d0QzQnJzSWtIMlBMZHVYVkZtMkh1RGtVTzBJRjhycUQ1TGliMjZqNGVodE4vTUtscGtTCnBFV3NneFBYSHVzT0JBUjVWdytDRElyMzRKcmVSNEsxeEtsQ0NTRUNnWUVBcmNDZVErMXFlTkRJTmdvcmhJTCsKUWQyWFlLbGsxdXNZSUEzKzE5RU9tVE1lOERyVFB6c0t1Y1pJQjlUdDB4a05Nd3E3MXRTcHdESk9hN0x3VXM3dgpQdE1GNk0xTUw1SUlUK2o1QjdiTUYrSE9pZEZIcUUyUFBwOThiaGpKR2ZKbkJKcTFMYk02ZTdJb3U3Ri9nVW84CmJ3L2RIK2Qxd3hWOE5CbFl3dHlSM2RFQ2dZQTBEdlVEd0FTeHhLWEpyNWcvYVRxRDl5d2dVVUt3SktEbURZR2MKOHAxZGl6QVIxL0lkNlpBRC9ucUVhemx6SXFrNlhrYldVcU94Y3hNN1BwcnRmMXFWbW5mQ3FwbFZ3SCtKeHVrRwpkNXRjKzA5TitzbW5jaTExV2tsQm1lUXZ1blA2eXZ6V0M3aGRiUEY3WHFuSGlvZXFaRlpHM2JIdklyd2x1SWRUCmlucWVvUUtCZ0dBN2NoTWxZa1M3OTd4TERLUXpyT0RBWkNycnk3NHNOTk8zdFRLZTR2eTNhZlRHaURpbDdjTnUKL1ZQSCsxNWQvTitrZlM1Tk5SZjR5cXNFWXFNYWkzWlpBaEd3S1ZQZXFCMDNBTXJ5ZXppMW5XbFhYTXFJVFFHRAo0TWQ2VG03dThRSExxZGtDWmZHVW1BN242M1p4TDRFdDl2YWVrWi9xU2M4MDBkY2VxOTU2Ci0tLS0tRU5EIFJTQSBQUklWQVRFIEtFWS0tLS0tCg==
diff --git a/kubernetes-configs/flex-pod1-olt-voltha16.yml b/kubernetes-configs/flex-pod1-olt-voltha16.yml
new file mode 100644
index 0000000..109afd3
--- /dev/null
+++ b/kubernetes-configs/flex-pod1-olt-voltha16.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 Flex POD 1 , olt/onu are connected to this
+
+# This file is used to optionally customize helm charts installations
+
+images:
+  netconf:
+    repository: '10.192.4.244:30500/voltha/voltha-netconf'
+    tag: 'voltha-test3'
+
+  ofagent:
+    repository: '10.192.4.244:30500/voltha/voltha-ofagent'
+    tag: 'voltha-test3'
+
+  vcli:
+    repository: '10.192.4.244:30500/voltha/voltha-cli'
+    tag: 'voltha-test3'
+
+  vcore:
+    repository: '10.192.4.244:30500/voltha/voltha-voltha'
+    tag: 'voltha-test3'
+
+  envoy_for_etcd:
+    repository: '10.192.4.244:30500/voltha/voltha-envoy'
+    tag: 'voltha-test3'
+
+  alarm_generator:
+    repository: '10.192.4.244:30500/voltha/voltha-alarm-generator'
+    tag: 'voltha-test3'
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml
new file mode 100755
index 0000000..3064223
--- /dev/null
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-fabric.yaml
@@ -0,0 +1,112 @@
+# 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 @flex-pod1-olt-fabric.yaml http://10.192.4.241:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/switch.yaml
+  - custom_types/switchport.yaml
+  - custom_types/portinterface.yaml
+  - custom_types/bngportmapping.yaml
+  - custom_types/attworkflowdriverwhitelistentry.yaml
+  - custom_types/attworkflowdriverservice.yaml
+  - custom_types/serviceinstanceattribute.yaml
+  - custom_types/onosapp.yaml
+
+description: Configures the Flex POD with AT&T workflow
+
+topology_template:
+  node_templates:
+    # Fabric configuration
+    switch#leaf_1:
+      type: tosca.nodes.Switch
+      properties:
+        driver: ofdpa3
+        ipv4Loopback: 192.168.9.24
+        ipv4NodeSid: 19
+        isEdgeRouter: false
+        name: Fabric Switch - 1
+        ofId: of:0000cc37ab5b6da8
+        routerMac: 00:00:00:00:00:03
+
+    # Setup the OLT switch port
+    port#olt_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 7
+        host_learning: false
+      requirements:
+        - switch:
+            node: switch#leaf_1
+            relationship: tosca.relationships.BelongsToOne
+
+    # Port connected to the BNG
+    port#bng_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 8
+      requirements:
+        - switch:
+            node: switch#leaf_1
+            relationship: tosca.relationships.BelongsToOne
+
+    # Setup the fabric switch port where the external
+    # router is connected to
+    bngmapping:
+      type: tosca.nodes.BNGPortMapping
+      properties:
+        s_tag: any
+        switch_port: 8
+
+    # DHCP L2 Relay config
+    onos_app#dhcpl2relay:
+      type: tosca.nodes.ONOSApp
+      properties:
+        name: dhcpl2relay
+        must-exist: true
+
+    dhcpl2relay-config-attr:
+      type: tosca.nodes.ServiceInstanceAttribute
+      properties:
+        name: /onos/v1/network/configuration/apps/org.opencord.dhcpl2relay
+        value: >
+          {
+            "dhcpl2relay" : {
+              "useOltUplinkForServerPktInOut" : false,
+              "dhcpServerConnectPoints" : [ "of:0000cc37ab5b6da8/8" ]
+            }
+          }
+      requirements:
+        - service_instance:
+            node: onos_app#dhcpl2relay
+            relationship: tosca.relationships.BelongsToOne
+
+    # ONU Whitelist
+    service#att:
+      type: tosca.nodes.AttWorkflowDriverService
+      properties:
+        name: att-workflow-driver
+        must-exist: true
+
+    ALPHe3d1cfa7:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ALPHe3d1cfa7
+        pon_port_id: 536870912
+        device_id: of:000000000ac004ce
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
new file mode 100755
index 0000000..a00311b
--- /dev/null
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-olt.yaml
@@ -0,0 +1,47 @@
+# 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 @flex-pod1-olt-olt.yaml http://10.192.4.241:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/oltdevice.yaml
+  - custom_types/onudevice.yaml
+  - custom_types/voltservice.yaml
+description: Create a simulated OLT Device in VOLTHA
+topology_template:
+  node_templates:
+
+    service#volt:
+      type: tosca.nodes.VOLTService
+      properties:
+        name: volt
+        must-exist: true
+
+    olt_device:
+      type: tosca.nodes.OLTDevice
+      properties:
+        name: olt-1
+        device_type: openolt
+        host: 10.192.4.206
+        port: 9191
+        switch_datapath_id: of:0000cc37ab5b6da8
+        switch_port: "7"
+        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/flex-pod1-olt-voltha16-subscriber.yaml b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-subscriber.yaml
new file mode 100755
index 0000000..4914bfd
--- /dev/null
+++ b/tosca-configs/att-workflow/flex-pod1-olt-voltha16-subscriber.yaml
@@ -0,0 +1,37 @@
+# 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 @onlab-pod1-subscriber.yaml http://10.90.0.101:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/rcordsubscriber.yaml
+
+description: Pre-provsion a subscriber
+
+topology_template:
+  node_templates:
+
+    # Pre-provision the subscriber the subscriber
+    my_house:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: My House-305
+        status: pre-provisioned
+        s_tag: 111
+        c_tag: 999
+        onu_device: ALPHe3d1cfa7
+        nas_port_id : "PON 1/1/03/1:1.1.1"
+        circuit_id: foo1
+        remote_id: bar1
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig.yaml b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
deleted file mode 100755
index 1e47e3d..0000000
--- a/tosca-configs/att-workflow/onlab-pod1-cig.yaml
+++ /dev/null
@@ -1,100 +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 @onlab-pod1-cig.yaml http://10.90.0.101: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/attworkflowdriverwhitelistentry.yaml
-  - custom_types/attworkflowdriverservice.yaml
-  - custom_types/rcordsubscriber.yaml
-  - custom_types/switch.yaml
-  - custom_types/switchport.yaml
-description: Create a simulated OLT Device in VOLTHA
-topology_template:
-  node_templates:
-
-    service#volt:
-      type: tosca.nodes.VOLTService
-      properties:
-        name: volt
-        must-exist: true
-
-    # CIG
-    olt_device:
-      type: tosca.nodes.OLTDevice
-      properties:
-        name: CIG
-        device_type: openolt
-        host: 10.90.0.115
-        port: 10400
-        switch_datapath_id: of:0000000000000001
-        switch_port: "4"
-        outer_tpid: "0x8100"
-        uplink: "65536"
-        nas_id: "NAS_ID"
-      requirements:
-        - volt_service:
-            node: service#volt
-            relationship: tosca.relationships.BelongsToOne
-
-    # Whitelist
-    service#att:
-      type: tosca.nodes.AttWorkflowDriverService
-      properties:
-        name: att-workflow-driver
-        must-exist: true
-
-    CIG:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: CIGG70606829
-        pon_port_id: 536870913
-        device_id: of:000000000a5a0073
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
-
-    # Pre-provision the subscriber
-    cig_subscriber_1:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: Sub_CIGG70606829
-        status: pre-provisioned
-        c_tag: 444
-        s_tag: 444
-        onu_device: CIGG70606829
-        nas_port_id : "PON 1/1/03/1:1.1.1"
-        circuit_id: foo1
-        remote_id: bar1
-
-    switch#leaf_1:
-      type: tosca.nodes.Switch
-      properties:
-        name: AGG_SWITCH
-        must-exist: true
-
-    port#cig_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 4
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#leaf_1
-            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
new file mode 100755
index 0000000..8e0daf5
--- /dev/null
+++ b/tosca-configs/att-workflow/onlab-pod1-edgecore.yaml
@@ -0,0 +1,47 @@
+# 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 @onlab-pod1-edgecore.yaml http://10.90.0.101:30007/run
+
+tosca_definitions_version: tosca_simple_yaml_1_0
+imports:
+  - custom_types/oltdevice.yaml
+  - custom_types/onudevice.yaml
+  - custom_types/voltservice.yaml
+description: Create a simulated OLT Device in VOLTHA
+topology_template:
+  node_templates:
+
+    service#volt:
+      type: tosca.nodes.VOLTService
+      properties:
+        name: volt
+        must-exist: true
+
+    olt_device:
+      type: tosca.nodes.OLTDevice
+      properties:
+        name: ONF OLT
+        device_type: openolt
+        host: 10.90.0.114
+        port: 9191
+        switch_datapath_id: of:0000000000000001
+        switch_port: "1"
+        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/onlab-pod1-olt.yaml b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
index bcfa161..c94b5e1 100755
--- a/tosca-configs/att-workflow/onlab-pod1-olt.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-olt.yaml
@@ -19,6 +19,11 @@
   - custom_types/oltdevice.yaml
   - custom_types/onudevice.yaml
   - custom_types/voltservice.yaml
+  - custom_types/attworkflowdriverwhitelistentry.yaml
+  - custom_types/attworkflowdriverservice.yaml
+  - custom_types/rcordsubscriber.yaml
+  - custom_types/switch.yaml
+  - custom_types/switchport.yaml
 description: Create a simulated OLT Device in VOLTHA
 topology_template:
   node_templates:
@@ -29,15 +34,16 @@
         name: volt
         must-exist: true
 
+    # CIG
     olt_device:
       type: tosca.nodes.OLTDevice
       properties:
-        name: ONF OLT
+        name: CIG
         device_type: openolt
-        host: 10.90.0.114
-        port: 9191
+        host: 10.90.0.115
+        port: 10400
         switch_datapath_id: of:0000000000000001
-        switch_port: "1"
+        switch_port: "4"
         outer_tpid: "0x8100"
         uplink: "65536"
         nas_id: "NAS_ID"
@@ -45,3 +51,50 @@
         - volt_service:
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
+
+    # Whitelist
+    service#att:
+      type: tosca.nodes.AttWorkflowDriverService
+      properties:
+        name: att-workflow-driver
+        must-exist: true
+
+    CIG:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: CIGG70606829
+        pon_port_id: 536870913
+        device_id: of:000000000a5a0073
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    # Pre-provision the subscriber
+    cig_subscriber_1:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_CIGG70606829
+        status: pre-provisioned
+        c_tag: 444
+        s_tag: 444
+        onu_device: CIGG70606829
+        nas_port_id : "PON 1/1/03/1:1.1.1"
+        circuit_id: foo1
+        remote_id: bar1
+
+    switch#leaf_1:
+      type: tosca.nodes.Switch
+      properties:
+        name: AGG_SWITCH
+        must-exist: true
+
+    port#cig_olt_port:
+      type: tosca.nodes.SwitchPort
+      properties:
+        portId: 4
+        host_learning: false
+      requirements:
+        - switch:
+            node: switch#leaf_1
+            relationship: tosca.relationships.BelongsToOne
\ No newline at end of file