diff --git a/src/boot.sh b/src/boot.sh
index 1a5cb36..8ed7786 100644
--- a/src/boot.sh
+++ b/src/boot.sh
@@ -3,8 +3,8 @@ set -Eeuo pipefail
 
 # Docker environment variables
 : "${TPM:="Y"}"         # Enable TPM
-: "${BOOT_MODE:="legacy"}"  # Boot mode
-: "${BIOS:="QEMU,VGA.bin"}" # Bios file
+: "${BIOS:=""}"        # Bios file
+: "${BOOT_MODE:="uefi"}"  # Boot mode
 
 SECURE=""
 DIR="/usr/share/qemu"
@@ -23,83 +23,78 @@ case "${BOOT_MODE,,}" in
     ROM="AAVMF_CODE.ms.fd"
     VARS="AAVMF_VARS.ms.fd"
     ;;
-  windows_legacy)
-    USB="usb-ehci,id=ehci"
-    ;;
-  legacy)
-    SECURE=""
-    ;;
   *)
-    info "Unknown boot mode '${BOOT_MODE}', defaulting to 'legacy'"
-    BOOT_MODE="legacy"
+    info "Unknown boot mode '${BOOT_MODE}', defaulting to 'uefi'"
+    BOOT_MODE="uefi"
+    ROM="AAVMF_CODE.fd"
+    VARS="AAVMF_VARS.fd"    
     ;;
 esac
 
-if [[ "${BOOT_MODE,,}" == "legacy" ]] || [[ "${BOOT_MODE,,}" == "windows_legacy" ]]; then
+if [ -n "$BIOS"]; then
 
   BOOT_OPTS="$BOOT_OPTS -bios $DIR/$BIOS"
+  return 0
+  
+fi
 
-else
+AAVMF="/usr/share/AAVMF/"
+DEST="$STORAGE/${BOOT_MODE,,}"
 
-  AAVMF="/usr/share/AAVMF/"
-  DEST="$STORAGE/${BOOT_MODE,,}"
+if [ ! -f "$DEST.rom" ]; then
+  [ ! -f "$AAVMF/$ROM" ] && error "UEFI boot file ($AAVMF/$ROM) not found!" && exit 44
+  cp "$AAVMF/$ROM" "$DEST.rom"
+fi
 
-  if [ ! -f "$DEST.rom" ]; then
-    [ ! -f "$AAVMF/$ROM" ] && error "UEFI boot file ($AAVMF/$ROM) not found!" && exit 44
-    cp "$AAVMF/$ROM" "$DEST.rom"
-  fi
+if [ ! -f "$DEST.vars" ]; then
+  [ ! -f "$AAVMF/$VARS" ] && error "UEFI vars file ($AAVMF/$VARS) not found!" && exit 45
+  cp "$AAVMF/$VARS" "$DEST.vars"
+fi
 
-  if [ ! -f "$DEST.vars" ]; then
-    [ ! -f "$AAVMF/$VARS" ] && error "UEFI vars file ($AAVMF/$VARS) not found!" && exit 45
-    cp "$AAVMF/$VARS" "$DEST.vars"
-  fi
+if [[ "${BOOT_MODE,,}" != "uefi" ]]; then
+  SECURE=",smm=on"
+  BOOT_OPTS="$BOOT_OPTS -global driver=cfi.pflash01,property=secure,value=on"
+fi
 
-  if [[ "${BOOT_MODE,,}" != "uefi" ]]; then
-    SECURE=",smm=on"
-    BOOT_OPTS="$BOOT_OPTS -global driver=cfi.pflash01,property=secure,value=on"
-  fi
+BOOT_OPTS="$BOOT_OPTS -drive file=$DEST.rom,if=pflash,unit=0,format=raw,readonly=on"
+BOOT_OPTS="$BOOT_OPTS -drive file=$DEST.vars,if=pflash,unit=1,format=raw"
 
-  BOOT_OPTS="$BOOT_OPTS -drive file=$DEST.rom,if=pflash,unit=0,format=raw,readonly=on"
-  BOOT_OPTS="$BOOT_OPTS -drive file=$DEST.vars,if=pflash,unit=1,format=raw"
+if [[ "${BOOT_MODE,,}" == "windows" ]]; then
 
-  if [[ "${BOOT_MODE,,}" == "windows" ]]; then
+  BOOT_OPTS="$BOOT_OPTS -global kvm-pit.lost_tick_policy=discard -global ICH9-LPC.disable_s3=1"
 
-    BOOT_OPTS="$BOOT_OPTS -global kvm-pit.lost_tick_policy=discard -global ICH9-LPC.disable_s3=1"
+  if [[ "$TPM" == [Yy1]* ]]; then
 
-    if [[ "$TPM" == [Yy1]* ]]; then
-
-      rm -rf /run/shm/tpm
-      rm -f /var/run/tpm.pid
-      mkdir -p /run/shm/tpm
-      chmod 755 /run/shm/tpm
-
-      if ! swtpm socket -t -d --tpmstate dir=/run/shm/tpm --ctrl type=unixio,path=/run/swtpm-sock --pid file=/var/run/tpm.pid --tpm2; then
-        error "Failed to start TPM emulator, reason: $?" && exit 19
-      fi
-
-      for (( i = 1; i < 20; i++ )); do
-
-        [ -S "/run/swtpm-sock" ] && break
-
-        if (( i % 10 == 0 )); then
-          echo "Waiting for TPM socket to become available..."
-        fi
-
-        sleep 0.1
-
-      done
-
-      if [ ! -S "/run/swtpm-sock" ]; then
-        TPM="N"
-        error "TPM socket not found? Disabling TPM support..."
-      else
-        BOOT_OPTS="$BOOT_OPTS -chardev socket,id=chrtpm,path=/run/swtpm-sock"
-        BOOT_OPTS="$BOOT_OPTS -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"
-      fi
+    rm -rf /run/shm/tpm
+    rm -f /var/run/tpm.pid
+    mkdir -p /run/shm/tpm
+    chmod 755 /run/shm/tpm
 
+    if ! swtpm socket -t -d --tpmstate dir=/run/shm/tpm --ctrl type=unixio,path=/run/swtpm-sock --pid file=/var/run/tpm.pid --tpm2; then
+      error "Failed to start TPM emulator, reason: $?" && exit 19
     fi
-  fi
 
+    for (( i = 1; i < 20; i++ )); do
+
+      [ -S "/run/swtpm-sock" ] && break
+
+      if (( i % 10 == 0 )); then
+        echo "Waiting for TPM socket to become available..."
+      fi
+
+      sleep 0.1
+
+    done
+
+    if [ ! -S "/run/swtpm-sock" ]; then
+      TPM="N"
+      error "TPM socket not found? Disabling TPM support..."
+    else
+      BOOT_OPTS="$BOOT_OPTS -chardev socket,id=chrtpm,path=/run/swtpm-sock"
+      BOOT_OPTS="$BOOT_OPTS -tpmdev emulator,id=tpm0,chardev=chrtpm -device tpm-tis,tpmdev=tpm0"
+    fi
+
+  fi
 fi
 
 return 0