diff --git a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
index f311ce3..a8ef272 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-fabric.yaml
@@ -76,10 +76,10 @@
         name: att-workflow-driver
         must-exist: true
 
-    ISKT71E81130:
+    ALPHE3D1CEA3:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71E81130
+        serial_number: ALPHE3D1CEA3
         pon_port_id: 536870912
         device_id: of:00000000c0a863b6
       requirements:
@@ -87,11 +87,11 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ISKT71E81050:
+    ALPHE3D1CEE9:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71E81050
-        pon_port_id: 536870913
+        serial_number: ALPHE3D1CEE9
+        pon_port_id: 536870912
         device_id: of:00000000c0a863b6
       requirements:
         - owner:
@@ -102,6 +102,28 @@
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
         serial_number: ISKT71E810C0
+        pon_port_id: 536870912
+        device_id: of:00000000c0a863b6
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    ISKT71E81050:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ISKT71E81130
+        pon_port_id: 536870913
+        device_id: of:00000000c0a863b6
+      requirements:
+        - owner:
+            node: service#att
+            relationship: tosca.relationships.BelongsToOne
+
+    ISKT71E810C0:
+      type: tosca.nodes.AttWorkflowDriverWhiteListEntry
+      properties:
+        serial_number: ISKT71E81050
         pon_port_id: 536870913
         device_id: of:00000000c0a863b6
       requirements:
diff --git a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
index f53095e..faf40f4 100755
--- a/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/edgecore-pod1-subscriber.yaml
@@ -58,3 +58,27 @@
         nas_port_id : "nas-port-id-ISKT71E810C0"
         circuit_id: "circuit-id-ISKT71E810C0"
         remote_id: "remote-id-ISKT71E810C0"
+
+    ALPHE3D1CEA3:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: ALPHE3D1CEA3
+        status: pre-provisioned
+        s_tag: 111
+        c_tag: 14
+        onu_device: ALPHE3D1CEA3
+        nas_port_id : "nas-port-id-ALPHE3D1CEA3"
+        circuit_id: "circuit-id-ALPHE3D1CEA3"
+        remote_id: "remote-id-ALPHE3D1CEA3"
+
+    ALPHE3D1CEE9:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: ALPHE3D1CEE9
+        status: pre-provisioned
+        s_tag: 111
+        c_tag: 15
+        onu_device: ALPHE3D1CEE9
+        nas_port_id : "nas-port-id-ALPHE3D1CEE9"
+        circuit_id: "circuit-id-ALPHE3D1CEE9"
+        remote_id: "remote-id-ALPHE3D1CEE9"