diff --git a/defaults/main.yml b/defaults/main.yml
index ed8582c..ad3b38d 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -14,5 +14,9 @@ keystone_config:
   token:
     provider: "fernet"
 
-  admin_user: 'admin'
+  admin_username: 'admin'
+  admin_role_name: 'admin'
+  admin_project_name: 'admin'
+  admin_service_name: 'keystone'
+  admin_domain_name: 'default'
   admin_password: 'weakpassword'
diff --git a/tasks/provision.yml b/tasks/provision.yml
index 425b211..7e24c0e 100644
--- a/tasks/provision.yml
+++ b/tasks/provision.yml
@@ -192,16 +192,24 @@
           - --config-file
           - /var/lib/kolla/config_files/keystone.conf
           - bootstrap
+          - --bootstrap-username
+          - '{{keystone_config.admin_username}}'
           - --bootstrap-password
           - '{{keystone_config.admin_password}}'
-#          - --bootstrap-admin-url
-#          - http://keystone:35357/v3
-#          - --bootstrap-internal-url
-#          - http://keystone:5000/v3
-#          - --bootstrap-public-url
-#          - http://keystone:5000/v3
-#          - --bootstrap-region-id
-#          - RegionOne
+          - --bootstrap-role-name
+          - '{{keystone_config.admin_role_name}}'
+          - --bootstrap-project-name
+          - '{{keystone_config.admin_project_name}}'
+          - --bootstrap-service-name
+          - '{{keystone_config.admin_service_name}}'
+          - --bootstrap-admin-url
+          - http://keystone:35357/v3
+          - --bootstrap-internal-url
+          - http://keystone:5000/v3
+          - --bootstrap-public-url
+          - http://keystone:5000/v3
+          - --bootstrap-region-id
+          - RegionOne
         env:
           - name: KOLLA_CONFIG_STRATEGY
             value: COPY_ALWAYS