diff --git a/scripts/install-proxmox-lxc.sh b/scripts/install-proxmox-lxc.sh
index e45a0d3..ed7aebe 100755
--- a/scripts/install-proxmox-lxc.sh
+++ b/scripts/install-proxmox-lxc.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -Eeuo pipefail
+
+trap 'printf "Erreur: echec de la commande [%s] a la ligne %s.\n" "$BASH_COMMAND" "$LINENO" >&2' ERR
 
 usage() {
   cat <<'EOF'
@@ -172,7 +174,9 @@ cleanup() {
 trap cleanup EXIT
 
 cat >"$payload_script" <<'REMOTE'
-set -euo pipefail
+set -Eeuo pipefail
+
+trap 'printf "Erreur: echec de la commande [%s] a la ligne %s.\n" "$BASH_COMMAND" "$LINENO" >&2' ERR
 
 ctid="$1"
 lxc_hostname="$2"
@@ -285,7 +289,7 @@ fi
 template_ref="${template_storage}:vztmpl/${template_name}"
 
 if [[ -z "$lxc_password" ]]; then
-  lxc_password="$(tr -dc 'A-Za-z0-9' </dev/urandom | head -c 20)"
+  lxc_password="$(od -An -N12 -tx1 /dev/urandom | tr -d ' \n')"
 fi
 
 net0="name=eth0,bridge=${lxc_bridge},ip=dhcp"
@@ -336,7 +340,9 @@ fi"
 
 ct_exec "cat > /usr/local/bin/update-chesscubing <<'SCRIPT'
 #!/usr/bin/env bash
-set -euo pipefail
+set -Eeuo pipefail
+
+trap 'printf \"Erreur: echec de la commande [%s] a la ligne %s.\\n\" \"\$BASH_COMMAND\" \"\$LINENO\" >&2' ERR
 
 repo_dir='/opt/chesscubing/repo'
 web_root='/var/www/chesscubing/current'
diff --git a/scripts/update-proxmox-lxc.sh b/scripts/update-proxmox-lxc.sh
index 944a0f4..f8a7499 100755
--- a/scripts/update-proxmox-lxc.sh
+++ b/scripts/update-proxmox-lxc.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
-set -euo pipefail
+set -Eeuo pipefail
+
+trap 'printf "Erreur: echec de la commande [%s] a la ligne %s.\n" "$BASH_COMMAND" "$LINENO" >&2' ERR
 
 usage() {
   cat <<'EOF'
@@ -101,7 +103,9 @@ cleanup() {
 trap cleanup EXIT
 
 cat >"$payload_script" <<'REMOTE'
-set -euo pipefail
+set -Eeuo pipefail
+
+trap 'printf "Erreur: echec de la commande [%s] a la ligne %s.\n" "$BASH_COMMAND" "$LINENO" >&2' ERR
 
 ctid="$1"
 lxc_hostname="$2"