Hiera changes to variables

Change-Id: I35ce8a96df99fe369150566c299daab75a39184d