Back up your config and try a 18.1 installer import configuration + guided install to reformat the disk while retaining your settings.