When the engine is warmed up, between 2200 and 2800 rpm I get a bit of
chain rattle from the motor. Doesn't seem to do it cold. Should I
just change the tensioner bolt (with the oil pressure tensioning)
without bothering with the rail or should both be changed at the same
time.

Thanks