SYS-1001: work on the fs mount/enables