diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 8c33bd4..b426642 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -52,48 +52,48 @@
             relationship: tosca.relationships.BelongsToOne
 
     # Setup the Adtran OLT switch port
-    port#adtran_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 50
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#agg_sw
-            relationship: tosca.relationships.BelongsToOne
+    # port#adtran_olt_port:
+    #   type: tosca.nodes.SwitchPort
+    #   properties:
+    #     portId: 50
+    #     host_learning: false
+    #   requirements:
+    #     - switch:
+    #         node: switch#agg_sw
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # Setup the CIG OLT switch port
-    port#cig_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 51
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#agg_sw
-            relationship: tosca.relationships.BelongsToOne
+    # # Setup the CIG OLT switch port
+    # port#cig_olt_port:
+    #   type: tosca.nodes.SwitchPort
+    #   properties:
+    #     portId: 51
+    #     host_learning: false
+    #   requirements:
+    #     - switch:
+    #         node: switch#agg_sw
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # Setup the Iskratel XGS-PON OLT switch port
-    port#iskratelx_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 46
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#agg_sw
-            relationship: tosca.relationships.BelongsToOne
+    # # Setup the Iskratel XGS-PON OLT switch port
+    # port#iskratelx_olt_port:
+    #   type: tosca.nodes.SwitchPort
+    #   properties:
+    #     portId: 46
+    #     host_learning: false
+    #   requirements:
+    #     - switch:
+    #         node: switch#agg_sw
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # Setup the Iskratel GPON OLT switch port
-    port#iskratelg_olt_port:
-      type: tosca.nodes.SwitchPort
-      properties:
-        portId: 47
-        host_learning: false
-      requirements:
-        - switch:
-            node: switch#agg_sw
-            relationship: tosca.relationships.BelongsToOne
+    # # Setup the Iskratel GPON OLT switch port
+    # port#iskratelg_olt_port:
+    #   type: tosca.nodes.SwitchPort
+    #   properties:
+    #     portId: 47
+    #     host_learning: false
+    #   requirements:
+    #     - switch:
+    #         node: switch#agg_sw
+    #         relationship: tosca.relationships.BelongsToOne
 
     # Port connected to the BNG
     port#bng_port:
@@ -137,29 +137,29 @@
             relationship: tosca.relationships.BelongsToOne
 
     # OLT app extra config
-    onos_app#olt:
-      type: tosca.nodes.ONOSApp
-      properties:
-        name: olt
-        must-exist: true
+    # onos_app#olt:
+    #   type: tosca.nodes.ONOSApp
+    #   properties:
+    #     name: olt
+    #     must-exist: true
 
-    olt-config-attr:
-      type: tosca.nodes.ServiceInstanceAttribute
-      properties:
-        name: /onos/v1/network/configuration/devices
-        value: >
-          {
-            "of:00000024454a6be4" : {
-              "basic" : {
-                "name" : "ADTRAN OLT",
-                "driver" : "voltha"
-              }
-            }
-          }
-      requirements:
-        - service_instance:
-            node: onos_app#olt
-            relationship: tosca.relationships.BelongsToOne
+    # olt-config-attr:
+    #   type: tosca.nodes.ServiceInstanceAttribute
+    #   properties:
+    #     name: /onos/v1/network/configuration/devices
+    #     value: >
+    #       {
+    #         "of:00000024454a6be4" : {
+    #           "basic" : {
+    #             "name" : "ADTRAN OLT",
+    #             "driver" : "voltha"
+    #           }
+    #         }
+    #       }
+    #   requirements:
+    #     - service_instance:
+    #         node: onos_app#olt
+    #         relationship: tosca.relationships.BelongsToOne
 
     # ONU Whitelist
     service#att:
@@ -180,105 +180,105 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ISKT71e81130:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT71e81130
-        pon_port_id: 536870912
-        device_id: of:00000000c0a8646f
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # ISKT71e81130:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ISKT71e81130
+    #     pon_port_id: 536870912
+    #     device_id: of:00000000c0a8646f
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # ONUs connected to Adtran OLT
-    ADTN17510028:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ADTN17510028
-        pon_port_id: 5
-        device_id: of:00000024454A6BE4
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # # ONUs connected to Adtran OLT
+    # ADTN17510028:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ADTN17510028
+    #     pon_port_id: 5
+    #     device_id: of:00000024454A6BE4
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    ADTN16180345:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ADTN16180345
-        pon_port_id: 6
-        device_id: of:00000024454A6BE4
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # ADTN16180345:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ADTN16180345
+    #     pon_port_id: 6
+    #     device_id: of:00000024454A6BE4
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # ONUs connected to CIG OLT
-    CIGG18a00002:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: CIGG18a00002
-        pon_port_id: 536870913
-        device_id: of:00000000c0a86471
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # # ONUs connected to CIG OLT
+    # CIGG18a00002:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: CIGG18a00002
+    #     pon_port_id: 536870913
+    #     device_id: of:00000000c0a86471
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # ONUs connected to Iskratel XGS-PON OLT
-    ISKT71e81070:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT71e81070
-        pon_port_id: 536870912
-        device_id: of:00000000c0a86472
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # # ONUs connected to Iskratel XGS-PON OLT
+    # ISKT71e81070:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ISKT71e81070
+    #     pon_port_id: 536870912
+    #     device_id: of:00000000c0a86472
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    ISKT71e81071:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT71e81071
-        pon_port_id: 536870912
-        device_id: of:00000000c0a86472
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # ISKT71e81071:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ISKT71e81071
+    #     pon_port_id: 536870912
+    #     device_id: of:00000000c0a86472
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    # ONUs connected to Iskratel GPON OLT
-    ISKT45f2c688:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT45f2c688
-        pon_port_id: 536870912
-        device_id: of:00000000c0a86473
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # # ONUs connected to Iskratel GPON OLT
+    # ISKT45f2c688:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ISKT45f2c688
+    #     pon_port_id: 536870912
+    #     device_id: of:00000000c0a86473
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    ISKT45f2bd61:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT45f2bd61
-        pon_port_id: 536870912
-        device_id: of:00000000c0a86473
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # ISKT45f2bd61:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ISKT45f2bd61
+    #     pon_port_id: 536870912
+    #     device_id: of:00000000c0a86473
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne
 
-    ISKT45f2c1e4:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT45f2c1e4
-        pon_port_id: 536870912
-        device_id: of:00000000c0a86473
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
+    # ISKT45f2c1e4:
+    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+    #   properties:
+    #     serial_number: ISKT45f2c1e4
+    #     pon_port_id: 536870912
+    #     device_id: of:00000000c0a86473
+    #   requirements:
+    #     - owner:
+    #         node: service#att
+    #         relationship: tosca.relationships.BelongsToOne