diff --git a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/connect_nextcloud_open-xchange.yml b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/connect_nextcloud_open-xchange.yml
new file mode 100644
index 0000000..a1665bb
--- /dev/null
+++ b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/connect_nextcloud_open-xchange.yml
@@ -0,0 +1,14 @@
+- name: Temporary workaround for sudo-rs
+  hosts: nextcloud
+  gather_facts: false
+  become: false
+  tasks:
+    - name: Detect sudo variant
+      ansible.builtin.raw: command -v sudo.ws || true
+      register: sudo_ws_check
+      changed_when: false
+
+    - name: Set become_exe fact based on sudo variant present
+      ansible.builtin.set_fact:
+        ansible_become_exe: "{{ 'sudo.ws' if sudo_ws_check.stdout | trim | length > 0 else 'sudo' }}"
+
diff --git a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/connect_nextcloud_openexchange.yml b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/connect_nextcloud_openexchange.yml
deleted file mode 100644
index e69de29..0000000
diff --git a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml.example
similarity index 58%
rename from playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml
rename to playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml.example
index f1a24bd..2d995f2 100644
--- a/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml
+++ b/playbooks/linux/ubuntu-server/nextcloud_full_deployment/vars/shared_vars.yml.example
@@ -1,3 +1,7 @@
+########################################
+# Nextcloud
+########################################
+
 # Recommended to use the latest stable version.
 nextcloud_version: "34.0.1"
 
@@ -6,18 +10,17 @@ nextcloud_version: "34.0.1"
 # The files that you will have to change are:
 # - /etc/nextcloud/config/config.php
 # - /etc/apache2/sites-available/nextcloud.conf
-nextcloud_domain: "cloud.test.local"
+nextcloud_domain: "cloud.example.com"
 
 # /etc/nextcloud is recommendet as the install dir by the hardening guide! Normally you can leave this as the default.
 nextcloud_install_dir: "/etc/nextcloud"
 nextcloud_data_dir: "/etc/nextcloud/data"
 
-
 nc_db_name: "nextcloud"
 nc_db_user: "nextcloud"
-nc_db_password: "Start2026!"
+nc_db_password: "ChangeMe1234_"
 nc_admin_user: "admin"
-nc_admin_password: "Start2026!"
+nc_admin_password: "ChangeMe1234_"
 
 # It is recommended to check what the php requirements are for the Nextcloud version you want to install. The default is set to 8.5, which is the recommended version as of July 2026.
 nc_php_version: "8.3"
@@ -33,12 +36,31 @@ nc_maintenance_window_start: 1
 # The fail2ban configuration directory. This is normally /etc/fail2ban, but can be changed if you have a custom setup.
 fail2ban_dir: "/etc/fail2ban"
 
-# The domain of your Collabora COPE server.
-collabora_code_domain: "172.30.170.15"
+########################################
+# Collabora CODE
+########################################
 
-# The admin password for your Collabora COPE server.
-collabora_admin_password: "Start2026!"
+# The domain of your Collabora CODE server.
+collabora_code_domain: "office.example.com"
+
+# The admin password for your Collabora CODE server.
+collabora_admin_password: "ChangeMe1234_"
 
 # Nextcloud TLS certificate paths
 cc_ssl_cert: "/etc/ssl/certs/collabora-selfsigned.crt"
-cc_ssl_key:  "/etc/ssl/private/collabora-selfsigned.key"
\ No newline at end of file
+cc_ssl_key:  "/etc/ssl/private/collabora-selfsigned.key"
+
+########################################
+# Open-Xchange
+########################################
+
+# The domain of your Open-Xchange server.
+openxchange_domain: "mail.example.com"
+
+# IMAP and SMTP ports for Open-Xchange. Adjust if you have a custom setup.
+openxchange_imap_port: 993
+openxchange_smtp_port: 587
+
+# Whether to use STARTTLS or SSL for SMTP. Adjust according to your Open-Xchange configuration.
+openxchange_smtp_starttls: true
+openxchange_smtp_ssl: true
\ No newline at end of file