diff --git a/defaults/main.yml b/defaults/main.yml
index ca9ffcc..82f9fa8 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,8 +6,8 @@ action: provision
 service_name: glance
 namespace: openstack
 
-hiera_data: {}
-hiera_data_file: ''
+hieradata: {}
+hieradata_file: ''
 
 clouds_config: 'clouds-secret'
 
diff --git a/tasks/hiera.yml b/tasks/hiera.yml
index ef5457a..7e00d98 100644
--- a/tasks/hiera.yml
+++ b/tasks/hiera.yml
@@ -2,8 +2,6 @@
   include_role:
     name: 'ansible-role-k8s-tripleo'
   vars:
-    hieradata: '{{hiera_data}}'
-    hieradata_file: '{{hiera_data_file}}'
     schema:
 # NOTE(flaper87): We should be able to use the connection
 # str coming from hiera. Let's use k8s' DNS for now.