diff --git a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
index 3a072ef..de453c7 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-fabric.yaml
@@ -111,36 +111,13 @@
         must-exist: true
 
     # ONUs connected to EdgeCore OLT
-    ALPHe3d1cfde:
+    ISKT71e801a0:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ALPHe3d1cfde
+        serial_number: ISKT71e801a0
         pon_port_id: 536870912
         device_id: of:00000000c0a8646f
       requirements:
         - owner:
             node: service#att
             relationship: tosca.relationships.BelongsToOne
-
-    ISKT71e80080:
-      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
-      properties:
-        serial_number: ISKT71e80080 
-        pon_port_id: 536870912
-        device_id: of:00000000c0a8646f
-      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
diff --git a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
index 73a1259..a95968f 100755
--- a/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
+++ b/tosca-configs/att-workflow/onf-demo-pod-subscriber.yaml
@@ -24,40 +24,14 @@
   node_templates:
 
     # EdgeCore OLT subscribers
-    edgecore_alpha_subscriber:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: Sub_ALPHe3d1cfde
-        status: pre-provisioned
-        c_tag: 11
-        s_tag: 111
-        onu_device: ALPHe3d1cfde
-        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_ISKT71e80080
+        name: Sub_ISKT71e801a0
         status: pre-provisioned
         c_tag: 12
         s_tag: 111
-        onu_device: ISKT71e80080 
+        onu_device: ISKT71e801a0
         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
-