diff --git a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
index 5d03bf0..799242b 100755
--- a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
@@ -98,10 +98,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ALPHe3d1cfde:
+    ISKT71E80080:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ALPHe3d1cfde
+        serial_number: ISKT71E80080
         pon_port_id: 536870912
         device_id: of:000000000a5a0097
       requirements:
@@ -109,21 +109,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    # BRCM12345678:
-    #   type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-    #   properties:
-    #     serial_number: BRCM12345678
-    #     pon_port_id: 536870916
-    #     device_id: of:000000000a5a0097
-    #   requirements:
-    #     - owner:
-    #         node: service#att
-    #         relationship: tosca.relationships.BelongsToOne
-
-    ISKT71E80080:
+    ALPHe3d1cfde:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71e80080
+        serial_number: ALPHe3d1cfde
         pon_port_id: 536870912
         device_id: of:000000000a5a0072
       requirements:
@@ -141,26 +130,3 @@
         - owner:
             node: service#att
             relationship: tosca.relationships.BelongsToOne
-
-
-    ALPHE3D1CEA3:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ALPHe3d1cea3
-        pon_port_id: 536870912
-        device_id: of:000000000a5a0072
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
-
-    ALPHE3D1CEE9:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ALPHe3d1cee9
-        pon_port_id: 536870912
-        device_id: of:000000000a5a0072
-      requirements:
-        - owner:
-            node: service#att
-            relationship: tosca.relationships.BelongsToOne
diff --git a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index 05ce301..68a4bb1 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -39,11 +39,11 @@
     ISK1:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: ISKClient80
+        name: Client3
         status: pre-provisioned
         c_tag: 112
         s_tag: 111
-        onu_device: ISKT71e80080
+        onu_device: ALPHe3d1cfde
         nas_port_id : "PON 1/1/04/1:1.1.1"
         circuit_id: foo2
         remote_id: bar2
@@ -59,27 +59,3 @@
         nas_port_id : "PON 1/1/05/1:1.1.1"
         circuit_id: foo3
         remote_id: bar3
-
-    ALPH1:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: ALPH-EA3
-        status: pre-provisioned
-        c_tag: 114
-        s_tag: 111
-        onu_device: ALPHe3d1cea3
-        nas_port_id : "PON 1/1/04/1:1.1.2"
-        circuit_id: foo4
-        remote_id: bar4
-
-    ALPH2:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: ALPH-EE9
-        status: pre-provisioned
-        c_tag: 115
-        s_tag: 111
-        onu_device: ALPHe3d1cee9
-        nas_port_id : "PON 1/1/04/1:1.1.3"
-        circuit_id: foo5
-        remote_id: bar5