diff --git a/costumize.sh b/costumize.sh
index ff269f9..414a3e4 100755
--- a/costumize.sh
+++ b/costumize.sh
@@ -56,10 +56,7 @@ set_hostname() {
     
     log "Setting hostname to: $new_hostname"
     
-    # Update hostname
-    sudo hostnamectl set-hostname "$new_hostname"
-    
-    # Update /etc/hosts
+    # Update /etc/hosts first to avoid hostname resolution issues
     sudo sed -i "s/127.0.1.1.*/127.0.1.1\t$new_hostname/" /etc/hosts
     
     # Add entry if it doesn't exist
@@ -67,6 +64,9 @@ set_hostname() {
         echo -e "127.0.1.1\t$new_hostname" | sudo tee -a /etc/hosts
     fi
     
+    # Update hostname after /etc/hosts is configured
+    sudo hostnamectl set-hostname "$new_hostname"
+    
     log "Hostname updated successfully"
     echo "New hostname: $(hostname)"