diff --git a/charmhelpers/contrib/openstack/templates/section-service-user b/charmhelpers/contrib/openstack/templates/section-service-user
index c740cc28..ff454086 100644
--- a/charmhelpers/contrib/openstack/templates/section-service-user
+++ b/charmhelpers/contrib/openstack/templates/section-service-user
@@ -3,8 +3,8 @@
 send_service_user_token = true
 auth_type = password
 auth_url = {{ auth_protocol }}://{{ auth_host }}:{{ auth_port }}
-project_domain_id = default
-user_domain_id = default
+project_domain_name = service_domain
+user_domain_name = service_domain
 project_name = {{ admin_tenant_name }}
 username = {{ admin_user }}
 password = {{ admin_password }}
diff --git a/test-requirements.txt b/test-requirements.txt
index 77482bc6..34dd51b9 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -27,3 +27,5 @@ git+https://github.com/openstack-charmers/zaza-openstack-tests.git@stable/zed#eg
 git+https://opendev.org/openstack/tempest.git#egg=tempest
 
 croniter            # needed for charm-rabbitmq-server unit tests
+
+jsonschema<4.18.0   # jsonschema 4.18.0 depends on Rust (via rpds-py)