diff --git a/docs/README.md b/docs/README.md
index 064ba4e..214a04f 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -47,7 +47,7 @@
       properties:
         serial_number: BRCM22222222
         pon_port_id: 536870912
-        olt_logical_device_id: of:000000000a5a0072
+        device_id: of:000000000a5a0072
       requirements:
         - owner:
             node: service#att
diff --git a/samples/whitelist.yaml b/samples/whitelist.yaml
index 4c0782a..cf43bda 100644
--- a/samples/whitelist.yaml
+++ b/samples/whitelist.yaml
@@ -33,7 +33,7 @@
       properties:
         serial_number: BRCM22222222
         pon_port_id: 536870912
-        olt_logical_device_id: of:000000000a5a0072
+        device_id: of:000000000a5a0072
       requirements:
         - owner:
             node: service#att
diff --git a/xos/synchronizer/steps/sync_att_workflow_driver_service_instance.py b/xos/synchronizer/steps/sync_att_workflow_driver_service_instance.py
index 1726e50..0b9546b 100644
--- a/xos/synchronizer/steps/sync_att_workflow_driver_service_instance.py
+++ b/xos/synchronizer/steps/sync_att_workflow_driver_service_instance.py
@@ -40,7 +40,7 @@
             return False
 
         whitelisted = matching_entries[0]
-        pon_port = ONUDevice.objects.get().pon_port
+        pon_port = ONUDevice.objects.get(serial_number=si.serial_number).pon_port
         if pon_port.port_no != whitelisted.pon_port_id or si.of_dpid != whitelisted.device_id:
             log.warn("ONU disable as location don't match", object=str(si), serial_number=si.serial_number,
                      **si.tologdict())