diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 87cc1ac..b870112 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -51,16 +51,16 @@
             node: switch#agg_sw
             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
+    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
 
     # Setup the CIG OLT switch port
     port#cig_olt_port:
@@ -73,16 +73,16 @@
             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:
@@ -191,17 +191,17 @@
     #         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
@@ -226,17 +226,17 @@
             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