Add better logic to make sure keystone is started