diff --git a/docker-compose.yml b/docker-compose.yml
index e04c194..a833cd4 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -2,7 +2,7 @@ version: "3"
 services:
   qemu:
     container_name: qemu
-    image: qemux/qemu-docker
+    image: qemux/qemu-arm
     environment:
       RAM_SIZE: "1G"
       CPU_CORES: "1"
diff --git a/readme.md b/readme.md
index a0e5538..60b84aa 100644
--- a/readme.md
+++ b/readme.md
@@ -46,7 +46,7 @@ services:
 Via `docker run`
 
 ```bash
-docker run -it --rm -e "BOOT=http://example.com/image.iso" -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN qemux/qemu-docker
+docker run -it --rm -e "BOOT=http://example.com/image.iso" -p 8006:8006 --device=/dev/kvm --cap-add NET_ADMIN qemux/qemu-arm
 ```
 
 ## FAQ
diff --git a/src/boot.sh b/src/boot.sh
index c42ea7b..d866bd3 100644
--- a/src/boot.sh
+++ b/src/boot.sh
@@ -3,7 +3,6 @@ set -Eeuo pipefail
 
 # Docker environment variables
 : "${BIOS:=""}"                 # Bios file
-: "${BOOT_MODE:="uefi"}"        # Boot mode
 
 BOOT_OPTS=""
 DIR="/usr/share/qemu"
diff --git a/src/display.sh b/src/display.sh
index a836fc2..d1ab516 100644
--- a/src/display.sh
+++ b/src/display.sh
@@ -7,7 +7,7 @@ set -Eeuo pipefail
 : "${VGA:="virtio-gpu"}"    # VGA adaptor
 
 if [[ "${BOOT_MODE,,}" == "windows" ]]; then
-  [[ "$VGA" == "virtio-gpu" ]] && VGA="VGA"
+  [[ "$VGA" == "virtio-gpu" ]] && VGA="ramfb"
 fi
 
 case "${DISPLAY,,}" in
diff --git a/src/entry.sh b/src/entry.sh
index 7a6cab1..e438fdd 100755
--- a/src/entry.sh
+++ b/src/entry.sh
@@ -9,9 +9,9 @@ cd /run
 . reset.sh      # Initialize system
 . install.sh    # Get bootdisk
 . disk.sh       # Initialize disks
+. display.sh    # Initialize graphics
 . network.sh    # Initialize network
 . boot.sh       # Configure boot
-. display.sh    # Initialize graphics
 . proc.sh       # Initialize processor
 . config.sh     # Configure arguments
 
diff --git a/src/proc.sh b/src/proc.sh
index a290e99..4506129 100644
--- a/src/proc.sh
+++ b/src/proc.sh
@@ -7,7 +7,7 @@ set -Eeuo pipefail
 : "${CPU_FLAGS:=""}"
 : "${CPU_MODEL:="host"}"
 
-[[ "$ARCH" != "arm"* ]] && KVM="N"
+[[ "$ARCH" != "arm64" ]] && KVM="N"
 
 if [[ "$KVM" != [Nn]* ]]; then
 
diff --git a/src/reset.sh b/src/reset.sh
index 6d7cc45..9b1b85e 100644
--- a/src/reset.sh
+++ b/src/reset.sh
@@ -25,6 +25,7 @@ echo
 : "${RAM_SIZE:="1G"}"     # Maximum RAM amount
 : "${DISK_SIZE:="16G"}"   # Initial data disk size
 : "${BOOT_INDEX:="10"}"   # Boot index of CD drive
+: "${BOOT_MODE:="uefi"}" # Boot in UEFI mode
 
 # Helper variables