diff --git a/zsh/functions/migrate-laptop.zsh b/zsh/functions/migrate-laptop.zsh
index 19b0384..d83ee25 100644
--- a/zsh/functions/migrate-laptop.zsh
+++ b/zsh/functions/migrate-laptop.zsh
@@ -434,7 +434,7 @@ EOF
 WiFi Credentials Export
 ======================
 Created: $(date)
-Machine: $(hostname)
+Machine: $HOST
 
 This directory contains:
 - wifi-networks.xml: List of saved WiFi networks
@@ -611,8 +611,8 @@ backup-before-migration() {
     cat > "$backup_dir/MANIFEST.txt" << EOF
 Laptop Migration Backup
 Created: $(date)
-Machine: $(hostname)
-User: $(whoami)
+Machine: $HOST
+User: $USER
 
 Contents:
 $(ls -la "$backup_dir")