diff --git a/src/boot.sh b/src/boot.sh
index 0531414..e8449c4 100644
--- a/src/boot.sh
+++ b/src/boot.sh
@@ -4,9 +4,9 @@ set -Eeuo pipefail
 # Docker environment variables
 : "${BIOS:=""}"                 # Bios file
 
+SECURE="off"
 BOOT_OPTS=""
 BOOT_DESC=""
-SECURE=",secure=off"
 DIR="/usr/share/qemu"
 
 case "${BOOT_MODE,,}" in
@@ -15,7 +15,7 @@ case "${BOOT_MODE,,}" in
     VARS="AAVMF_VARS.fd"
     ;;
   secure)
-    SECURE=",secure=on"
+    SECURE="on"
     BOOT_DESC=" securely"
     ROM="AAVMF_CODE.secboot.fd"
     VARS="AAVMF_VARS.fd"
@@ -26,7 +26,7 @@ case "${BOOT_MODE,,}" in
     BOOT_OPTS="-rtc base=localtime"
     ;;
   windows_secure)
-    SECURE=",secure=on"
+    SECURE="on"
     BOOT_DESC=" securely"
     ROM="AAVMF_CODE.ms.fd"
     VARS="AAVMF_VARS.ms.fd"
diff --git a/src/config.sh b/src/config.sh
index 89e3281..c79c8c3 100644
--- a/src/config.sh
+++ b/src/config.sh
@@ -11,7 +11,7 @@ USB_OPTS="-device $USB -device usb-kbd -device usb-tablet"
 RAM_OPTS=$(echo "-m ${RAM_SIZE^^}" | sed 's/MB/M/g;s/GB/G/g;s/TB/T/g')
 CPU_OPTS="-cpu $CPU_FLAGS -smp $CPU_CORES,sockets=1,dies=1,cores=$CPU_CORES,threads=1"
 MON_OPTS="-monitor $MONITOR -name $PROCESS,process=$PROCESS,debug-threads=on"
-MAC_OPTS="-machine type=${MACHINE}${SECURE},dump-guest-core=off${KVM_OPTS}"
+MAC_OPTS="-machine type=${MACHINE},secure=${SECURE},dump-guest-core=off${KVM_OPTS}"
 DEV_OPTS="-object rng-random,id=objrng0,filename=/dev/urandom"
 DEV_OPTS="$DEV_OPTS -device virtio-rng-pci,rng=objrng0,id=rng0,bus=pcie.0,addr=0x1c"
 [[ "${BOOT_MODE,,}" != "windows"* ]] && DEV_OPTS="$DEV_OPTS -device virtio-balloon-pci,id=balloon0,bus=pcie.0,addr=0x4"
diff --git a/src/reset.sh b/src/reset.sh
index 65bb76f..b126873 100644
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -44,7 +44,8 @@ HOST=$(hostname -s)
 KERNEL=$(echo "$SYS" | cut -b 1)
 MINOR=$(echo "$SYS" | cut -d '.' -f2)
 ARCH=$(dpkg --print-architecture)
-CPU=$(lscpu | grep -m 1 'Model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
+SOCKETS=$(lscpu | grep -m 1 -i 'socket(s)' | awk '{print $(2)}')
+CPU=$(lscpu | grep -m 1 -i 'model name' | cut -f 2 -d ":" | awk '{$1=$1}1' | sed 's# @.*##g' | sed s/"(R)"//g | sed 's/[^[:alnum:] ]\+/ /g' | sed 's/  */ /g')
 
 # Check system