Fix upgrade steps to avoid overwriting custom configuration