diff --git a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
index afed8f9..a374730 100755
--- a/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-fabric.yaml
@@ -150,12 +150,12 @@
         name: att-workflow-driver
         must-exist: true
 
-    BRCM22222222:
+    ALPHe3d1cfac:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: BRCM22222222
-        # pon_port_id: 536870912
-        pon_port_id: 12345678
+        serial_number: ALPHe3d1cfac
+        pon_port_id: 536870912
+        # pon_port_id: 12345678
         device_id: of:000000000a5a0072
       requirements:
         - owner:
@@ -173,10 +173,10 @@
             node: service#att
             relationship: tosca.relationships.BelongsToOne
 
-    ISKT71e801a0:
+    ISKT71e80080:
       type: tosca.nodes.AttWorkflowDriverWhiteListEntry
       properties:
-        serial_number: ISKT71e801a0
+        serial_number: ISKT71e80080
         pon_port_id: 536870912
         device_id: of:000000000a5a0072
       requirements:
diff --git a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
index dc8e23c..652f4ee 100755
--- a/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
+++ b/tosca-configs/att-workflow/onlab-pod1-subscriber.yaml
@@ -35,25 +35,6 @@
          name: Bronze
 
     # Pre-provision the subscriber the subscriber
-    onf_subscriber_1:
-      type: tosca.nodes.RCORDSubscriber
-      properties:
-        name: Sub_BRCM22222222
-        status: pre-provisioned
-        c_tag: 111
-        s_tag: 111
-        onu_device: BRCM22222222
-        nas_port_id : "PON 1/1/03/1:1.1.1"
-        circuit_id: foo1
-        remote_id: bar1
-      requirements:
-        - upstream_bps:
-            node: high_speed_bp
-            relationship: tosca.relationships.BelongsToOne
-        - downstream_bps:
-            node: high_speed_bp
-            relationship: tosca.relationships.BelongsToOne
-
     onf_subscriber_2:
       type: tosca.nodes.RCORDSubscriber
       properties:
@@ -76,11 +57,30 @@
     onf_subscriber_3:
       type: tosca.nodes.RCORDSubscriber
       properties:
-        name: Sub_ISKT71e801a0
+        name: Sub_ISKT71e80080
         status: pre-provisioned
         c_tag: 113
         s_tag: 111
-        onu_device: ISKT71e801a0
+        onu_device: ISKT71e80080
+        nas_port_id : "PON 1/1/05/1:1.1.1"
+        circuit_id: foo3
+        remote_id: bar3
+      requirements:
+        - upstream_bps:
+            node: high_speed_bp
+            relationship: tosca.relationships.BelongsToOne
+        - downstream_bps:
+            node: high_speed_bp
+            relationship: tosca.relationships.BelongsToOne
+
+    onf_subscriber_4:
+      type: tosca.nodes.RCORDSubscriber
+      properties:
+        name: Sub_ALPHe3d1cfac
+        status: pre-provisioned
+        c_tag: 111
+        s_tag: 111
+        onu_device: ALPHe3d1cfac
         nas_port_id : "PON 1/1/05/1:1.1.1"
         circuit_id: foo3
         remote_id: bar3