Moved variables to hiera