Revert specific roles for 310 env