diff --git a/deploy.sh b/deploy.sh
index 8d14048..58b3133 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -610,15 +610,19 @@ sum_up() {
 Please save these secrets in a secure location (e.g., a password manager).
 
 **Service Credentials:**
-* **Home Assistant MQTT User:** \`$HOME_ASSISTANT_MQTT_USER\`
-* **Home Assistant MQTT Password:** \`$HOME_ASSISTANT_MQTT_PASSWORD\`
-* **Passbolt DB Name:** \`$PASSBOLT_MYSQL_DATABASE\`
-* **Passbolt DB User:** \`$PASSBOLT_MYSQL_USER\`
-* **Passbolt DB Password:** \`$PASSBOLT_MYSQL_PASSWORD\`
-* **Pi-hole Web Password:** \`$FTLCONF_WEBSERVER_PASSWORD\`
-* **Immich DB Name:** \`$IMMICH_DB_DATABASE_NAME\`
-* **Immich DB User:** \`$IMMICH_DB_USERNAME\`
-* **Immich DB Password:** \`$IMMICH_DB_PASSWORD\`
+$( [[ -n ${HOME_ASSISTANT_MQTT_USER:-} ]] && echo "* **Home Assistant MQTT User:** \`${HOME_ASSISTANT_MQTT_USER}\`" && \
+echo "* **Home Assistant MQTT Password:** \`$HOME_ASSISTANT_MQTT_PASSWORD\`" || echo "* **Home assistant:** *Not configured*" )
+$( [[ -n ${FTLCONF_WEBSERVER_PASSWORD:-} ]] && echo "* **Pi-hole Web Password:** \`${FTLCONF_WEBSERVER_PASSWORD}\`" && \
+|| echo "* **Pi-hole:** *Not configured*" )
+$( [[ -n ${PASSBOLT_DB_NAME:-} ]] && echo "* **Passbolt DB Name:** \`${PASSBOLT_DB_NAME}\`" && \
+echo "* **Passbolt DB User:** \`${PASSBOLT_DB_USERNAME}\`" && echo "* **Passbolt DB Password:** \`${PASSBOLT_DB_PASSWORD}\`" \
+|| echo "* **Pi-hole:** *Not configured*" )
+$( [[ -n ${IMMICH_DB_NAME:-} ]] && echo "* **Immich DB Name:** \`${Immich_DB_NAME}\`" && \
+echo "* **Immich DB User:** \`${IMMICH_DB_USERNAME}\`" && echo "* **Immich DB Password:** \`${IMMICH_DB_PASSWORD}\`" \
+|| echo "* **Immich:** *Not configured*" )
+$( [[ -n ${GITEA_DB_NAME:-} ]] && echo "* **Gitea DB Name:** \`${GITEA_DB_NAME}\`" && \
+echo "* **Gitea DB User:** \`${GITEA_DB_USERNAME}\`" && echo "* **Gitea DB Password:** \`${GITEA_DB_PASSWORD}\`" \
+|| echo "* **Gitea:** *Not configured*" )
 
 **Disk Encryption Keys:**
 $(for i in $(seq 1 "${#BOOT_DISKS_ID[@]}"); do f="final-nix-config/etc/secrets/disks/boot-disk-${i}"; [[ -f "$f" ]] && echo "* **Boot Disk $i Key:** \`$(cat "$f")\`"; done)
diff --git a/templates/nix-config/disks/spindown.nix b/templates/nix-config/disks/spindown.nix
index e8b0e6f..d74ee1c 100644
--- a/templates/nix-config/disks/spindown.nix
+++ b/templates/nix-config/disks/spindown.nix
@@ -2,7 +2,7 @@
 
 let
   hardDrives = [
-    "DISK_LIST"
+DISK_LIST
   ];
 in