diff --git a/service/files/defaults.yaml b/service/files/defaults.yaml
index 94f718e..e7e4f9d 100644
--- a/service/files/defaults.yaml
+++ b/service/files/defaults.yaml
@@ -32,6 +32,10 @@ configs:
     project_name: admin
     role_name: admin
 
+  service_account:
+    domain: default
+    project: service
+
 sources:
   openstack/keystone:
     git_url: https://git.openstack.org/openstack/keystone.git
diff --git a/service/keystone.yaml b/service/keystone.yaml
index 3ed22da..bb615d9 100644
--- a/service/keystone.yaml
+++ b/service/keystone.yaml
@@ -78,9 +78,14 @@ service:
           - keystone-fernet
         command: daemon.sh
       post:
+        - name: keystone-create-domain
+          type: single
+          command: openstack domain create --or-show {{ service_account.domain }}
         - name: keystone-create-project
           type: single
-          command: openstack project create service
+          dependencies:
+            - keystone-create-domain
+          command: openstack project create --domain {{ service_account.domain }} {{ service_account.project }}
 
 files:
   keystone-conf: