diff --git a/quickemu b/quickemu
index 481f219..e6e0b56 100755
--- a/quickemu
+++ b/quickemu
@@ -464,14 +464,19 @@ function vm_boot() {
 
   # Make any OS specific adjustments
   case ${guest_os} in
-    freebsd|linux|openbsd)
+    *bsd|haiku|linux)
       CPU="-cpu host,kvm=on"
       if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then
         CPU="${CPU},topoext"
       fi
+
       if [ "${guest_os}" == "freebsd" ]; then
         MOUSE="usb-mouse"
+      elif [ "${guest_os}" == "haiku" ]; then
+        MACHINE_TYPE="pc"
+        NET_DEVICE="rtl8139"
       fi
+
       if [ -z "${disk_size}" ]; then
         disk_size="16G"
       fi
@@ -483,22 +488,10 @@ function vm_boot() {
       fi
       MACHINE_TYPE="pc"
       NET_DEVICE="rtl8139"
-      GUEST_TWEAKS="-boot d"
       if [ -z "${disk_size}" ]; then
         disk_size="256M"
       fi
       ;;
-    haiku)
-      CPU="-cpu host,kvm=on"
-      MACHINE_TYPE="pc"
-      NET_DEVICE="rtl8139"
-      if [ "${HOST_CPU_VENDOR}" == "AuthenticAMD" ]; then
-        CPU="${CPU},topoext"
-      fi
-      if [ -z "${disk_size}" ]; then
-        disk_size="32G"
-      fi
-      ;;
     macos)
       #https://www.nicksherlock.com/2020/06/installing-macos-big-sur-on-proxmox/
       # A CPU with SSE4.1 support is required for >= macOS Sierra
diff --git a/quickget b/quickget
index eb154df..38f9cf7 100755
--- a/quickget
+++ b/quickget
@@ -588,8 +588,8 @@ function make_vm_config() {
     IMAGE_FILE="${1}"
     ISO_FILE="${2}"
     case "${OS}" in
-        freebsd )
-            GUEST="freebsd"
+        freebsd|openbsd)
+            GUEST="bsd"
             IMAGE_TYPE="iso";;
         haiku)
             GUEST="haiku"
@@ -597,13 +597,10 @@ function make_vm_config() {
         kolibrios)
             GUEST="kolibrios"
             IMAGE_TYPE="iso";;
-        openbsd )
-            GUEST="openbsd"
-            IMAGE_TYPE="iso";;
-        macos )
+        macos)
             GUEST="macos"
             IMAGE_TYPE="img";;
-        windows )
+        windows)
             GUEST="windows"
             IMAGE_TYPE="iso";;
         *)