GB Warehouse UB system addresses - consignee details

we have some warehousekeepers who are registered in NI - Xi Warehouse keeper approvals but have GB warehosues - in VW you only have the deliver address set against the warehosuekeeper and Delivery point i UK is it possible to have a consignee set up and the delivery address set up - these are currently failing in VB because you select the GB under bond delivery point which pulls through the UK address into consignee info when it needs consignee address to be the BT address of the warehouse keeper.

we have to update these manually at present