Fix running twice for each cluster

File systems script will also need to be fixed