diff --git a/LICENSE b/LICENSE
index 5f6bcbc..b3a8aef 100644
--- a/LICENSE
+++ b/LICENSE
@@ -209,7 +209,7 @@ If you develop a new program, and you want it to be of the greatest possible use
 To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the “copyright” line and a pointer to where the full notice is found.
 
      numbus-server
-     Copyright (C) 2025  raphael
+     Copyright (C) 2025  Raphaël Billet
 
      This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
@@ -221,7 +221,7 @@ Also add information on how to contact you by electronic and paper mail.
 
 If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode:
 
-     numbus-server  Copyright (C) 2025  raphael
+     numbus-server  Copyright (C) 2025  Raphaël Billet
      This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
      This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details.
 
diff --git a/deploy.sh b/deploy.sh
index 734328d..89068a2 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -609,7 +609,7 @@ Please review the selected disk layout before proceeding.
 **Boot Disks (${#BOOT_DISKS_ID_LIST[@]}) :**
 
 * **Boot 1:** \`${BOOT_DISKS_ID_LIST[0]}\`
-$( [[ -n "${BOOT_DISKS_ID_LIST[1]:-}" ]] && echo "* **Boot 2:** \`${BOOT_DISKS_ID_LIST[1]}\`" || echo "* **Boot 2:** *Not configured*" )
+$( [[ -n "${BOOT_DISKS_ID_LIST[1]:-}" ]] && echo "* **Boot 2:** \`${BOOT_DISKS_ID_LIST[1]}\`" )
 
 **Data Disks ($CONTENT_DISK_NUMBER) :**
 
@@ -658,7 +658,7 @@ Please save the following secrets to a secure place (i.e. your local password ma
 **Boot Disks (${#BOOT_DISKS_ID_LIST[@]}) :**
 
 * **Disk 1 Secret Key :** \`$( cat final-nix-config/etc/secrets/disks/boot-1 )\`
-$( [[ -n "${BOOT_DISKS_ID_LIST[1]:-}" ]] && echo "* **Disk 2 secret key :** \`$( cat final-nix-config/etc/secrets/disks/boot-2 )\`" || echo "* **Boot 2:** *Not configured*" )
+$( [[ -n "${BOOT_DISKS_ID_LIST[1]:-}" ]] && echo "* **Disk 2 secret key :** \`$( cat final-nix-config/etc/secrets/disks/boot-2 )\`" )
 
 **Data Disks ($CONTENT_DISK_NUMBER):**
 
@@ -731,12 +731,22 @@ cloudflare_dns_setup() {
 
   echo -e "\n\n ☁️  Configuring Cloudflare DNS records..."
 
-  SELECTED_SERVICES_DNS=()
+  i=0
   for service in "${SELECTED_WEB_APPLICATIONS[@]}"; do
+    if [[ -n "${SELECTED_WEB_APPLICATION_SUBDOMAIN[${i}]:-}" ]]; then
+      SELECTED_SERVICES_DNS+=( "${SELECTED_WEB_APPLICATION_SUBDOMAIN[${i}]}.${DOMAIN_NAME}" )
+    else
+      SELECTED_SERVICES_DNS+=( "${service}.${DOMAIN_NAME}" )
+    fi
+    i=$((i + 1))
     [[ "${service}" == "nextcloud" ]] && SELECTED_SERVICES_DNS+=( "onlyoffice.${DOMAIN_NAME}" "whiteboard.${DOMAIN_NAME}" )
-    SELECTED_SERVICES_DNS+=( "${service}.${DOMAIN_NAME}" )
   done
-  SELECTED_SERVICES_DNS+=( "${SELECTED_DNS_SERVICE}.${DOMAIN_NAME}" )
+
+  if [[ -n "${SELECTED_DNS_SERVICE_SUBDOMAIN[0]:-}" ]]; then
+    SELECTED_SERVICES_DNS+=( "${SELECTED_DNS_SERVICE_SUBDOMAIN[0]}.${DOMAIN_NAME}" )
+  else
+    SELECTED_SERVICES_DNS+=( "${SELECTED_DNS_SERVICE}.${DOMAIN_NAME}" )
+  fi
 
   # Get Zone ID
   ZONE_ID=$(curl -s -X GET "https://api.cloudflare.com/client/v4/zones?name=${DOMAIN_NAME}" \