Fix upgrade step to add just the locking behaviour