diff --git a/scripts/vm/vm_configurator.sh b/scripts/vm/vm_configurator.sh
index 7759bc0..513ec2d 100644
--- a/scripts/vm/vm_configurator.sh
+++ b/scripts/vm/vm_configurator.sh
@@ -173,11 +173,26 @@ function configure_vm_advanced() {
   BIOS_TYPE=" -bios $BIOS"
 
   # CPU Type
+#  CPU_CHOICE=$(whiptail --backtitle "ProxMenux" --title "$(translate "CPU Model")" \
+#    --radiolist "$(translate "Select CPU model")" 10 60 2 \
+#    "host"  "Host (recommended)" ON \
+#    "kvm64" "Generic KVM64" OFF 3>&1 1>&2 2>&3) || return 1
+#  [[ "$CPU_CHOICE" == "host" ]] && CPU_TYPE=" -cpu host" || CPU_TYPE=" -cpu kvm64"
+
   CPU_CHOICE=$(whiptail --backtitle "ProxMenux" --title "$(translate "CPU Model")" \
-    --radiolist "$(translate "Select CPU model")" 10 60 2 \
-    "host"  "Host (recommended)" ON \
-    "kvm64" "Generic KVM64" OFF 3>&1 1>&2 2>&3) || return 1
-  [[ "$CPU_CHOICE" == "host" ]] && CPU_TYPE=" -cpu host" || CPU_TYPE=" -cpu kvm64"
+  --radiolist "$(translate "Select CPU model")" 22 78 12 \
+  "host"          "Host (recommended)" ON \
+  "kvm64"         "Generic KVM64" OFF \
+  "kvm32"         "Generic KVM32" OFF \
+  "qemu64"        "QEMU 64-bit CPU" OFF \
+  "qemu32"        "QEMU 32-bit CPU" OFF \
+  "max"           "Expose all QEMU CPU features" OFF \
+  "x86-64-v2"     "Nehalem-class (x86-64-v2)" OFF \
+  "x86-64-v2-AES" "Same as v2 but with AES" OFF \
+  "x86-64-v3"     "Haswell-class (x86-64-v3)" OFF \
+  "x86-64-v4"     "Skylake-class (x86-64-v4)" OFF 3>&1 1>&2 2>&3) || return 1
+
+  CPU_TYPE=" -cpu $CPU_CHOICE"
 
   # Core Count
   CORE_COUNT=$(whiptail --backtitle "ProxMenux" --inputbox "$(translate "Number of CPU cores (default: 2)")" \