diff --git a/dishes/phyllome-desktop-intelcpu-intelgpu.cfg b/dishes/phyllome-desktop-intelcpu-intelgpu.cfg
index 588fb09..b17a3ce 100644
--- a/dishes/phyllome-desktop-intelcpu-intelgpu.cfg
+++ b/dishes/phyllome-desktop-intelcpu-intelgpu.cfg
@@ -8,8 +8,8 @@ keyboard --xlayouts='ch (fr)'
 rootpw --iscrypted --lock locked
 # System language
 lang en_US.UTF-8
-# Reboot after installation
-reboot --kexec
+# Shutdown after installation
+shutdown
 # Use text mode install
 text
 # Network information
@@ -190,16 +190,24 @@ mkdir /mnt/sysimage/var/lib/libvirt/iso # Create a directory to store iso images
 wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/iso/ # fetch netboot.xyz iso and store it to the newly created iso directory
 
 # fetch custom script and make it executable
-wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-user-vms.sh -P /mnt/sysimage/usr/sbin/
-chmod +x /mnt/sysimage/usr/sbin/create-user-vms.sh
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-generic-vm-virtio-spice.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/create-generic-vm-virtio-spice.sh
 
 # fetch custom script and make it executable
-wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-system-vms.sh -P /mnt/sysimage/usr/sbin/
-chmod +x /mnt/sysimage/usr/sbin/create-system-vms.sh
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/deploy-minimal-server.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/deploy-minimal-server.sh
 
 # fetch custom script and make it executable
-wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/sbin/
-chmod +x /mnt/sysimage/usr/sbin/virtualization-tweaks-root-needed.sh
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/deploy-minimal-workstation.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/deploy-minimal-workstation.sh
+
+# fetch custom script and make it executable
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/deploy-phyllome-desktop.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/deploy-phyllome-desktop.sh
+
+# fetch custom script and make it executable
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh
 
 %end
 
diff --git a/dishes/phyllome-server-intelcpu-intelgpu.cfg b/dishes/phyllome-server-intelcpu-intelgpu.cfg
index 642822f..22af54a 100644
--- a/dishes/phyllome-server-intelcpu-intelgpu.cfg
+++ b/dishes/phyllome-server-intelcpu-intelgpu.cfg
@@ -6,8 +6,8 @@ keyboard --xlayouts='ch (fr)'
 rootpw --iscrypted --lock locked
 # System language
 lang en_US.UTF-8
-# Reboot after installation
-reboot --kexec
+# Shutdown after installation
+shutdown
 # Use text mode install
 text
 # Network information
@@ -58,16 +58,24 @@ mkdir /mnt/sysimage/var/lib/libvirt/iso # Create a directory to store iso images
 wget https://boot.netboot.xyz/ipxe/netboot.xyz.iso -P /mnt/sysimage/var/lib/libvirt/iso/ # fetch netboot.xyz iso and store it to the newly created iso directory
 
 # fetch custom script and make it executable
-wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-user-vms.sh -P /mnt/sysimage/usr/sbin/
-chmod +x /mnt/sysimage/usr/sbin/create-user-vms.sh
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-generic-vm-virtio-spice.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/create-generic-vm-virtio-spice.sh
 
 # fetch custom script and make it executable
-wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/create-system-vms.sh -P /mnt/sysimage/usr/sbin/
-chmod +x /mnt/sysimage/usr/sbin/create-system-vms.sh
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/deploy-minimal-server.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/deploy-minimal-server.sh
 
 # fetch custom script and make it executable
-wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/sbin/
-chmod +x /mnt/sysimage/usr/sbin/virtualization-tweaks-root-needed.sh
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/deploy-minimal-workstation.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/deploy-minimal-workstation.sh
+
+# fetch custom script and make it executable
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/deploy-phyllome-desktop.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/deploy-phyllome-desktop.sh
+
+# fetch custom script and make it executable
+wget https://raw.githubusercontent.com/PhyllomeOS/phyllomeos/main/post-first-startup-scripts/virtualization-tweaks-root-needed.sh -P /mnt/sysimage/usr/local/bin/
+chmod +x /mnt/sysimage/usr/local/bin/virtualization-tweaks-root-needed.sh
 
 %end