Changing to serve-static