Move VAFs to align with tunnel