diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index b426642..ef9a6d1 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -62,27 +62,27 @@
     #         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:
@@ -214,29 +214,29 @@
     #         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
+    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