diff --git a/keystone/values.yaml b/keystone/values.yaml
index 4809c56f86..b271846b4d 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -64,6 +64,12 @@ bootstrap:
           --project-domain="${OS_PROJECT_DOMAIN_NAME}" \
           --project="${OS_PROJECT_NAME}" \
           "member"
+    # admin needs the admin role for the default domain
+    openstack role add \
+          --user="${OS_USERNAME}" \
+          --domain="${OS_DEFAULT_DOMAIN}" \
+          "admin"
+
 
 network:
   api:
@@ -1149,6 +1155,7 @@ endpoints:
         project_name: admin
         user_domain_name: default
         project_domain_name: default
+        default_domain_id: default
       test:
         role: admin
         region_name: RegionOne
@@ -1157,6 +1164,7 @@ endpoints:
         project_name: test
         user_domain_name: default
         project_domain_name: default
+        default_domain_id: default
     hosts:
       default: keystone
       internal: keystone-api