City building buy back on track