diff --git a/defaults/main.yml b/defaults/main.yml
index 9c4457d..56c1697 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -9,6 +9,10 @@ hiera_data_file: ''
 
 clouds_config: 'clouds-secret'
 
+mariadb_config:
+  host: mariadb
+  root_password: weakpassword
+
 keystone_config:
   DEFAULT:
     public_bind_host: "0.0.0.0"
diff --git a/tasks/hiera.yml b/tasks/hiera.yml
index 8fb25dc..2ab9b9e 100644
--- a/tasks/hiera.yml
+++ b/tasks/hiera.yml
@@ -8,6 +8,10 @@
       # NOTE(flaper87): Needed for bootstrap
       # operations
       keystone::admin_password: admin_password
+      keystone::db::mysql::dbname: db.db_name
+      keystone::db::mysql::host: db.host
+      keystone::db::mysql::password: db.password
+      keystone::db::mysql::user: db.user
 
       keystone::admin_token: DEFAULT.admin_token
       keystone::admin_workers: eventlet_server.admin_workers
diff --git a/tasks/provision.yml b/tasks/provision.yml
index ae30056..ddb18cf 100644
--- a/tasks/provision.yml
+++ b/tasks/provision.yml
@@ -91,6 +91,13 @@
       httpd-keystone-admin.conf: |
         {{httpd_keystone_admin_conf['content'] | b64decode}}
 
+- name: Create keystone database
+  include_role:
+    name: ansible-role-k8s-tripleo
+    tasks_from: create-database
+  vars:
+    service_name: 'keystone'
+    database_name: 'keystone'
 
 - name: Create keystone job
   k8s_v1_job:
@@ -100,25 +107,6 @@
     name: keystone-db-sync
     namespace: "{{namespace}}"
     state: present
-    spec_template_metadata_annotations:
-      pod.beta.kubernetes.io/init-containers: '[
-          {
-            "name": "keystone-db-create",
-            "image": "tripleoupstream/centos-binary-mariadb",
-            "imagePullPolicy": "IfNotPresent",
-            "restartPolicy": "OnFailure",
-            "command": [
-              "mysql",
-              "-h",
-              "mariadb",
-              "-u",
-              "root",
-              "--password=weakpassword",
-              "-e",
-              "create database if not exists keystone;"
-            ]
-          }
-        ]'
     restart_policy: OnFailure
     containers:
       - image: tripleoupstream/centos-binary-keystone