diff --git a/provision-keystone-apb/defaults/main.yaml b/provision-keystone-apb/defaults/main.yaml
index 1c83bc1..2cb3425 100644
--- a/provision-keystone-apb/defaults/main.yaml
+++ b/provision-keystone-apb/defaults/main.yaml
@@ -1,3 +1,14 @@
 coe_host: "https://rhev-i32c-03.mpc.lab.eng.bos.redhat.com:6443"
 kube_context: "kubernetes-admin@kubernetes"
 config_file: /root/.kube/config
+
+hiera_data: {}
+hiera_data_file: ''
+
+keystone_config:
+  DEFAULT:
+    public_bind_host: "0.0.0.0"
+  database:
+    connection: "mysql+pymysql://root:weakpassword@mariadb:3306/keystone"
+  token:
+    provider: "fernet"
diff --git a/provision-keystone-apb/tasks/hiera.yaml b/provision-keystone-apb/tasks/hiera.yaml
index a75d39b..ab09f10 100644
--- a/provision-keystone-apb/tasks/hiera.yaml
+++ b/provision-keystone-apb/tasks/hiera.yaml
@@ -2,7 +2,8 @@
   include_role:
     name: 'ansible-role-k8s-tripleo'
   vars:
-    hieradata:
+    hieradata: '{{hiera_data}}'
+    hieradata_file: '{{hiera_data_file}}'
     schema:
       keystone::admin_token: DEFAULT.admin_token
       keystone::admin_workers: eventlet_server.admin_workers
@@ -28,6 +29,7 @@
       keystone::rabbit_host: oslo_messaging_rabbit.rabbit_host
     fact_variable: 'keystone_config'
 
+
 #     keystone::admin_password: DEFAULT.admin_password ?
 #      keystone::service_name: 'httpd'
 #      keystone::cron::token_flush::destination: '/dev/null'
diff --git a/provision-keystone-apb/tasks/main.yaml b/provision-keystone-apb/tasks/main.yaml
index e1eccba..eadc0b1 100644
--- a/provision-keystone-apb/tasks/main.yaml
+++ b/provision-keystone-apb/tasks/main.yaml
@@ -19,6 +19,8 @@
     - httpd-keystone-admin.conf
     - keystone-schema.yaml
 
+- include: hiera.yaml
+
 - name: Run oslo.config
   include_role:
     name: os-gen-config
@@ -27,13 +29,7 @@
     config_show_help: false
     config_show_defaults: false
     dest: "/tmp/keystone.conf"
-    config_data:
-      DEFAULT:
-        public_bind_host: "0.0.0.0"
-      database:
-        connection: "mysql+pymysql://root:weakpassword@mariadb:3306/keystone"
-      token:
-        provider: "fernet"
+    config_data: '{{keystone_config}}'
 
 - name: Read configs into memory
   slurp: