diff --git a/playbooks/host_hatoria.banananet.work.yml b/playbooks/host_hatoria.banananet.work.yml
index aab3aa3..4d207a4 100644
--- a/playbooks/host_hatoria.banananet.work.yml
+++ b/playbooks/host_hatoria.banananet.work.yml
@@ -1,5 +1,8 @@
 - name: Configure hatoria.banananet.work
   hosts: hatoria.banananet.work
+  vars:
+    bnet_cloud_domain: "cloud.banananet.work"
+    bnet_cloud_username: "{{ bnet_cloud_domain | domain_to_username }}"
   roles:
     - role: nginx/default_server # Would not be configurable otherwise
     # Banananet.work
@@ -35,7 +38,8 @@
     - role: server/nextcloud
       tags:
         - cloud.banananet.work
-      domain: cloud.banananet.work
+      domain: "{{ bnet_cloud_domain }}"
+      system_user: "{{ bnet_cloud_username }}"
       nextcloud_admin_user: "{{ global_username }}"
       enabled_apps_list:
         - accessibility