diff --git a/tosca-configs/att-workflow/bbwf-fabric.yaml b/tosca-configs/att-workflow/bbwf-fabric.yaml
index 5c8e6a0..5ca70a2 100755
--- a/tosca-configs/att-workflow/bbwf-fabric.yaml
+++ b/tosca-configs/att-workflow/bbwf-fabric.yaml
@@ -144,27 +144,27 @@
         must-exist: true
 
     # ONUs connected to EdgeCore OLT
-    ALPHE3D1CEE9:
+    ALPHe3d1cee9:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ALPHE3D1CEE9
+        serial_number: ALPHe3d1cee9
         pon_port_id: 536870912
-        device_id: of:00000000C0A8646F
+        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
+    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:
@@ -189,70 +189,70 @@
     #         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:
+    # ISKT71e81070:
     #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
     #   properties:
-    #     serial_number: ISKT71E81070
+    #     serial_number: ISKT71e81070
     #     pon_port_id: 536870912
-    #     device_id: of:00000000C0A86472
+    #     device_id: of:00000000c0a86472
     #   requirements:
     #     - owner:
     #         node: service#att
     #         relationship: tosca.relationships.BelongsToOne
 
-    # ISKT71E81071:
+    # ISKT71e81071:
     #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
     #   properties:
-    #     serial_number: ISKT71E81071
+    #     serial_number: ISKT71e81071
     #     pon_port_id: 536870912
-    #     device_id: of:00000000C0A86472
+    #     device_id: of:00000000c0a86472
     #   requirements:
     #     - owner:
     #         node: service#att
     #         relationship: tosca.relationships.BelongsToOne
 
     # # ONUs connected to Iskratel GPON OLT
-    # ISKT45F2C688:
+    # ISKT45f2c688:
     #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
     #   properties:
-    #     serial_number: ISKT45F2C688
+    #     serial_number: ISKT45f2c688
     #     pon_port_id: 536870912
-    #     device_id: of:00000000C0A86473
+    #     device_id: of:00000000c0a86473
     #   requirements:
     #     - owner:
     #         node: service#att
     #         relationship: tosca.relationships.BelongsToOne
 
-    # ISKT45F2BD61:
+    # ISKT45f2bd61:
     #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
     #   properties:
-    #     serial_number: ISKT45F2BD61
+    #     serial_number: ISKT45f2bd61
     #     pon_port_id: 536870912
-    #     device_id: of:00000000C0A86473
+    #     device_id: of:00000000c0a86473
     #   requirements:
     #     - owner:
     #         node: service#att
     #         relationship: tosca.relationships.BelongsToOne
 
-    # ISKT45F2C1E4:
+    # ISKT45f2c1e4:
     #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
     #   properties:
-    #     serial_number: ISKT45F2C1E4
+    #     serial_number: ISKT45f2c1e4
     #     pon_port_id: 536870912
-    #     device_id: of:00000000C0A86473
+    #     device_id: of:00000000c0a86473
     #   requirements:
     #     - owner:
     #         node: service#att
diff --git a/tosca-configs/att-workflow/bbwf-subscriber.yaml b/tosca-configs/att-workflow/bbwf-subscriber.yaml
index 64581bf..00cf1ce 100755
--- a/tosca-configs/att-workflow/bbwf-subscriber.yaml
+++ b/tosca-configs/att-workflow/bbwf-subscriber.yaml
@@ -27,26 +27,26 @@
     edgecore_alpha_subscriber:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: Sub_ALPHE3D1CEE9
+        name: Sub_ALPHe3d1cee9
         status: pre-provisioned
         c_tag: 11
         s_tag: 111
-        onu_device: ALPHE3D1CEE9
+        onu_device: ALPHe3d1cee9
         nas_port_id : "PON 1/1/03/1:1.1.1"
         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: 22
-    #     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: 22
+        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:
@@ -73,28 +73,28 @@
     #     circuit_id: adtran_sub2_circuit
     #     remote_id: adtran_sub2_remote
 
-    # # CIG OLT subscribers
-    # cig_subscriber_1:
-    #   type: tosca.nodes.RCORDSubscriber
-    #   properties:
-    #     name: Sub_CIGG18a00002
-    #     status: pre-provisioned
-    #     c_tag: 11
-    #     s_tag: 333
-    #     onu_device: CIGG18a00002
-    #     nas_port_id : "PON 1/1/05/1:1.1.1"
-    #     circuit_id: cig_sub1_circuit
-    #     remote_id: cig_sub1_remote
+    # CIG OLT subscribers
+    cig_subscriber_1:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_CIGG18a00002
+        status: pre-provisioned
+        c_tag: 11
+        s_tag: 333
+        onu_device: CIGG18a00002
+        nas_port_id : "PON 1/1/05/1:1.1.1"
+        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
+    #     name: Sub_ISKT71e81070
     #     status: pre-provisioned
     #     c_tag: 11
     #     s_tag: 444
-    #     onu_device: ISKT71E81070
+    #     onu_device: ISKT71e81070
     #     nas_port_id : "PON 1/1/05/1:1.1.1"
     #     circuit_id: iskx_sub1_circuit
     #     remote_id: iskx_sub1_remote
@@ -102,11 +102,11 @@
     # iskratelx_subscriber_2:
     #   type: tosca.nodes.RCORDSubscriber
     #   properties:
-    #     name: Sub_ISKT71E81071
+    #     name: Sub_ISKT71e81071
     #     status: pre-provisioned
     #     c_tag: 22
     #     s_tag: 444
-    #     onu_device: ISKT71E81071
+    #     onu_device: ISKT71e81071
     #     nas_port_id : "PON 1/1/05/1:1.1.1"
     #     circuit_id: iskx_sub2_circuit
     #     remote_id: iskx_sub2_remote
@@ -115,11 +115,11 @@
     # iskratelg_subscriber_1:
     #   type: tosca.nodes.RCORDSubscriber
     #   properties:
-    #     name: Sub_ISKT45F2C688
+    #     name: Sub_ISKT45f2c688
     #     status: pre-provisioned
     #     c_tag: 11
     #     s_tag: 555
-    #     onu_device: ISKT45F2C688
+    #     onu_device: ISKT45f2c688
     #     nas_port_id : "PON 1/1/05/1:1.1.1"
     #     circuit_id: iskg_sub1_circuit
     #     remote_id: iskg_sub1_remote
@@ -127,11 +127,11 @@
     # iskratelg_subscriber_2:
     #   type: tosca.nodes.RCORDSubscriber
     #   properties:
-    #     name: Sub_ISKT45F2BD61
+    #     name: Sub_ISKT45f2bd61
     #     status: pre-provisioned
     #     c_tag: 22
     #     s_tag: 555
-    #     onu_device: ISKT45F2BD61
+    #     onu_device: ISKT45f2bd61
     #     nas_port_id : "PON 1/1/05/1:1.1.1"
     #     circuit_id: iskg_sub2_circuit
     #     remote_id: iskg_sub2_remote
@@ -139,11 +139,11 @@
     # iskratelg_subscriber_3:
     #   type: tosca.nodes.RCORDSubscriber
     #   properties:
-    #     name: Sub_ISKT45F2C1E4
+    #     name: Sub_ISKT45f2c1e4
     #     status: pre-provisioned
     #     c_tag: 33
     #     s_tag: 555
-    #     onu_device: ISKT45F2C1E4
+    #     onu_device: ISKT45f2c1e4
     #     nas_port_id : "PON 1/1/05/1:1.1.1"
     #     circuit_id: iskg_sub3_circuit
     #     remote_id: iskg_sub3_remote