Gearbox to Upper Mount Bolts - Part Numbers

[Bluest]

I recently had the gearbox out and my understanding is that the gearbox to engine mount bolts are all stretch bolts and should be replaced. These are the 3 bolts that mount the aluminium bracket to the gearbox and three bolts that connect that bracket to the engine mount. So 6 in total and I think they are all the same.

I bought a gearbox mount bolt kit, but the bolts were mostly wrong as I think those kits are for if you are replacing the actual rubber mount on the chassis leg.

Can anyone confirm the right part number(s) for the bolts I need?

[Bluest]

Done a bit more digging

The bracket to gearbox bolts are number 22 on the diagram linked below (N10709001), 3 required. I also need 3x number 24, but I don't know the part number or if they are exactly the same as 22. Anyone know?

https://www.akstuning.co.uk/shop/home/3063-genuine-vag-gearbox-mount-bolt-n10709001.html

[Bluest]

Not wanting to appear to be totally mad by talking to myself, but I think I've solved this.

No.22 on the diagram - N10709001 - M12 × 1.5 × 78 mm - Aluminium bracket to gearbox (3 required)

No. 24 on the diagram - N10552404 - M12 x 1.5 x 70 mm - Aluminium bracket to gearbox mount (3 required)

This is for a manual gearbox, not sure if DSG is the same.

[Al1040]

Well done for solving your puzzle 
Some lucky Mk7 manual gearbox owner in the future will owe you a pint!