Move to using Hiera