diff --git a/kubernetes-configs/onlab-pod1.yml b/kubernetes-configs/onlab-pod1.yml
index ec87d7e..4b046f6 100644
--- a/kubernetes-configs/onlab-pod1.yml
+++ b/kubernetes-configs/onlab-pod1.yml
@@ -1,14 +1,12 @@
 # SEBA Values
 
-envoyForEtcdImage: '10.90.0.101:30500/voltha/voltha-envoy:cig'
-#freeradiusImage: '10.90.0.101:30500/freeradius:tls'
-# freeradiusImage: 'tpdock/freeradius:latest'
-netconfImage: '10.90.0.101:30500/voltha/voltha-netconf:cig'
-ofagentImage: '10.90.0.101:30500/voltha/voltha-ofagent:cig'
-vcliImage: '10.90.0.101:30500/voltha/voltha-cli:cig'
-vcoreImage: '10.90.0.101:30500/voltha/voltha-voltha:cig'
+# envoyForEtcdImage: '10.90.0.101:30500/voltha/voltha-envoy:cig'
+# netconfImage: '10.90.0.101:30500/voltha/voltha-netconf:cig'
+# ofagentImage: '10.90.0.101:30500/voltha/voltha-ofagent:cig'
+# vcliImage: '10.90.0.101:30500/voltha/voltha-cli:cig'
+# vcoreImage: '10.90.0.101:30500/voltha/voltha-voltha:cig'
 
-# onosImage: '10.90.0.101:30500/onosproject/onos:candidate'
+onosImage: '10.90.0.101:30500/onosproject/onos:latest'
 
 application_logs: |
    log4j.logger.org.opencord.olt = TRACE
diff --git a/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
new file mode 100755
index 0000000..5a28461
--- /dev/null
+++ b/tosca-configs/att-workflow/onlab-pod1-bbsim.yaml
@@ -0,0 +1,83 @@
+# 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-bbsim.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
+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: BBSIM_OLT
+        device_type: bbsim
+        host: bbsim.voltha.svc
+        # host: 10.233.33.1
+        port: 50060
+        switch_datapath_id: of:0000000000000001
+        switch_port: "3"
+        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
+
+    NONE31323030:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: NONE30313030
+        pon_port_id: 536870912
+        # device_id: of:000000000ae9327a
+        device_id: of:0000aabbccddee12
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    # Pre-provision the subscriber
+    bbsim_subscriber_1:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_NONE30313030
+        status: pre-provisioned
+        c_tag: 123
+        s_tag: 456
+        onu_device: NONE30313030
+        nas_port_id : "PON 1/1/03/1:1.1.1"
+        circuit_id: foo1
+        remote_id: bar1
\ No newline at end of file
diff --git a/tosca-configs/att-workflow/onlab-pod1-cig.yaml b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
index 89f9497..1e47e3d 100755
--- a/tosca-configs/att-workflow/onlab-pod1-cig.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-cig.yaml
@@ -22,6 +22,8 @@
   - 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:
@@ -79,4 +81,20 @@
         onu_device: CIGG70606829
         nas_port_id : "PON 1/1/03/1:1.1.1"
         circuit_id: foo1
-        remote_id: bar1
\ No newline at end of file
+        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-pod2-fabric.yaml b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
index 5a51c20..6d0e8de 100755
--- a/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod2-fabric.yaml
@@ -35,7 +35,7 @@
         ipv4Loopback: 192.168.0.201
         ipv4NodeSid: 17
         isEdgeRouter: True
-        name: leaf_1
+        name: AGG_SWITCH
         ofId: of:0000000000000002
         routerMac: 00:00:02:01:06:01