diff --git a/deploy.sh b/deploy.sh
index da062b7..31e5095 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -800,19 +800,20 @@ elif [[ "$ACTION_ANSWER" == "[2] 💽 Deploy NixOS on a remote machine with a fi
   gum confirm "Do you understand and wish to proceed?" || { echo "❌ Aborting as requested"; exit 1; }
   necessary_information_config
   setup_ssh
+  hierarchy_preparation
   hardware_detection
   disks_selection
-  folder_tree_generation
-  services_generation
-  disks_generation
+  server_config_generation
+  network_config_generation
+  services_config_generation
+  mail_config_generation
+  disk_config_generation
   keys_generation
-  nix_generation
-  cloudflare_dns_setup
   sum_up
+  cloudflare_dns_setup
   export_configuration
   deploy
   postrun_action
-  congrats
 
 elif [[ "$ACTION_ANSWER" == "[3] 🛠️ Update a NixOS remote machine" ]]; then
   TARGET_USER="numbus-admin"