Just to give an update, this was resolved with the below config