diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 061d1cb..4b88c13 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -51,16 +51,16 @@
             node: switch#leaf_1
             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#leaf_1
-    #         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#leaf_1
+            relationship: tosca.relationships.BelongsToOne
 
     # Setup the CIG OLT switch port
     port#cig_olt_port:
@@ -166,28 +166,28 @@
             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:
diff --git a/tosca-configs/att-workflow/bbwf-olt.yaml b/tosca-configs/att-workflow/bbwf-olt.yaml
index 7530f64..4b3ceaa 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
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index 14dcb14..87e7edc 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -48,30 +48,30 @@
         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
-    #   properties:
-    #     name: Sub_ADTN16180345
-    #     status: pre-provisioned
-    #     c_tag: 22
-    #     s_tag: 222
-    #     onu_device: ADTN16180345
-    #     nas_port_id : "PON 1/1/05/1:1.1.1"
-    #     circuit_id: adtran_sub2_circuit
-    #     remote_id: adtran_sub2_remote
+    adtran_subscriber_2:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ADTN16180345
+        status: pre-provisioned
+        c_tag: 22
+        s_tag: 222
+        onu_device: ADTN16180345
+        nas_port_id : "PON 1/1/05/1:1.1.1"
+        circuit_id: adtran_sub2_circuit
+        remote_id: adtran_sub2_remote
 
     # CIG OLT subscribers
     cig_subscriber_1: