revamp service restarts to remove bug on baremetal installs