Z4 Coupe boot not always closing properly

[htid]

Hi all, so on my 2008 Z4 Coupe when I close the boot and then get in the car to drive off the yellow door light is on indicating one of the doors isn't closed properly. In my case it's the boot. I have to open and close it then get back in shut the door numerous times before it eventually locks properly. Obviously this is really annoying, anyone else had this? Does is sound like it's simply replacing with a new boot lock? ..... Just one other point when I go to open it, I have to pull the badge open 3 times before it opens the boot fully

 

[Leadfoot Z]

I would try the cheap option first, a bit of good old grease injected into it, this may free it up.