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
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
index ccd218b..2f1fb6e 100755
--- a/tosca-configs/att-workflow/bbwf-olt.yaml
+++ b/tosca-configs/att-workflow/bbwf-olt.yaml
@@ -46,22 +46,22 @@
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
 
-    # adtran:
-    #   type: tosca.nodes.OLTDevice
-    #   properties:
-    #     name: Adtran OLT
-    #     device_type: adtran_olt
-    #     host: 192.168.100.112
-    #     port: 830
-    #     switch_datapath_id: of:0000000000000001
-    #     switch_port: "50"
-    #     outer_tpid: "0x8100"
-    #     uplink: "1"
-    #     nas_id: "NAS_ID"
-    #   requirements:
-    #     - volt_service:
-    #         node: service#volt
-    #         relationship: tosca.relationships.BelongsToOne
+    adtran:
+      type: tosca.nodes.OLTDevice
+      properties:
+        name: Adtran OLT
+        device_type: adtran_olt
+        host: 192.168.100.112
+        port: 830
+        switch_datapath_id: of:0000000000000001
+        switch_port: "50"
+        outer_tpid: "0x8100"
+        uplink: "1"
+        nas_id: "NAS_ID"
+      requirements:
+        - volt_service:
+            node: service#volt
+            relationship: tosca.relationships.BelongsToOne
 
     cig:
       type: tosca.nodes.OLTDevice
@@ -80,22 +80,22 @@
             node: service#volt
             relationship: tosca.relationships.BelongsToOne
 
-    # iskratel-xgspon:
-    #   type: tosca.nodes.OLTDevice
-    #   properties:
-    #     name: Iskratel XGS-PON OLT
-    #     device_type: openolt
-    #     host: 192.168.100.114
-    #     port: 9191
-    #     switch_datapath_id: of:0000000000000001
-    #     switch_port: "46"
-    #     outer_tpid: "0x8100"
-    #     uplink: "65536"
-    #     nas_id: "NAS_ID"
-    #   requirements:
-    #     - volt_service:
-    #         node: service#volt
-    #         relationship: tosca.relationships.BelongsToOne
+    iskratel-xgspon:
+      type: tosca.nodes.OLTDevice
+      properties:
+        name: Iskratel XGS-PON OLT
+        device_type: openolt
+        host: 192.168.100.114
+        port: 9191
+        switch_datapath_id: of:0000000000000001
+        switch_port: "46"
+        outer_tpid: "0x8100"
+        uplink: "65536"
+        nas_id: "NAS_ID"
+      requirements:
+        - volt_service:
+            node: service#volt
+            relationship: tosca.relationships.BelongsToOne
 
     iskratel-gpon:
       type: tosca.nodes.OLTDevice
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index 80ac9c0..a0cf76e 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -36,30 +36,30 @@
         circuit_id: edgecore_alpha_circuit
         remote_id: edgecore_alpha_remote
 
-    # edgecore_iskratel_subscriber:
-    #   type: tosca.nodes.RCORDSubscriber
-    #   properties:
-    #     name: Sub_ISKT71e81130
-    #     status: pre-provisioned
-    #     c_tag: 12
-    #     s_tag: 111
-    #     onu_device: ISKT71e81130
-    #     nas_port_id : "PON 1/1/04/1:1.1.1"
-    #     circuit_id: edgecore_iskratel_circuit
-    #     remote_id: edgecore_iskratel_remote
+    edgecore_iskratel_subscriber:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ISKT71e81130
+        status: pre-provisioned
+        c_tag: 12
+        s_tag: 111
+        onu_device: ISKT71e81130
+        nas_port_id : "PON 1/1/04/1:1.1.1"
+        circuit_id: edgecore_iskratel_circuit
+        remote_id: edgecore_iskratel_remote
 
-    # # Adtran OLT subscribers
-    # adtran_subscriber_1:
-    #   type: tosca.nodes.RCORDSubscriber
-    #   properties:
-    #     name: Sub_ADTN17510028
-    #     status: pre-provisioned
-    #     c_tag: 21
-    #     s_tag: 222
-    #     onu_device: ADTN17510028
-    #     nas_port_id : "PON 1/1/05/1:1.1.1"
-    #     circuit_id: adtran_sub1_circuit
-    #     remote_id: adtran_sub1_remote
+    # Adtran OLT subscribers
+    adtran_subscriber_1:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ADTN17510028
+        status: pre-provisioned
+        c_tag: 21
+        s_tag: 222
+        onu_device: ADTN17510028
+        nas_port_id : "PON 1/1/05/1:1.1.1"
+        circuit_id: adtran_sub1_circuit
+        remote_id: adtran_sub1_remote
 
     # adtran_subscriber_2:
     #   type: tosca.nodes.RCORDSubscriber
@@ -86,18 +86,18 @@
         circuit_id: cig_sub1_circuit
         remote_id: cig_sub1_remote
 
-    # # Iskratel XGS-PON OLT subscribers
-    # iskratelx_subscriber_1:
-    #   type: tosca.nodes.RCORDSubscriber
-    #   properties:
-    #     name: Sub_ISKT71e81070
-    #     status: pre-provisioned
-    #     c_tag: 41
-    #     s_tag: 444
-    #     onu_device: ISKT71e81070
-    #     nas_port_id : "PON 1/1/05/1:1.1.1"
-    #     circuit_id: iskx_sub1_circuit
-    #     remote_id: iskx_sub1_remote
+    # Iskratel XGS-PON OLT subscribers
+    iskratelx_subscriber_1:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ISKT71e81070
+        status: pre-provisioned
+        c_tag: 41
+        s_tag: 444
+        onu_device: ISKT71e81070
+        nas_port_id : "PON 1/1/05/1:1.1.1"
+        circuit_id: iskx_sub1_circuit
+        remote_id: iskx_sub1_remote
 
     # iskratelx_subscriber_2:
     #   type: tosca.nodes.RCORDSubscriber