diff --git a/.build/images/dietpi-build b/.build/images/dietpi-build
index 651fc8edfc..7cd289f46a 100755
--- a/.build/images/dietpi-build
+++ b/.build/images/dietpi-build
@@ -169,8 +169,9 @@ esac
 
 if [[ $VMTYPE ]]
 then
-	[[ $HW_MODEL == 20 ]] || { G_DIETPI-NOTIFY 1 "Unsupported option \"-v\" (virtual machine type) for hardware model \"$HW_MODEL\" passed, aborting..."; exit 1; }
-	[[ $VMTYPE =~ ^(raw|vbox|vmx|esxi|hyperv|utm|proxmox|all)$ ]] || { G_DIETPI-NOTIFY 1 "Invalid virtual machine type \"$VMTYPE\" passed, aborting..."; exit 1; }
+	[[ $HW_MODEL == 20 ]] || Error_Exit "Unsupported option \"-v\" (virtual machine type) for hardware model \"$HW_MODEL\" passed, aborting ..."
+	[[ $VMTYPE =~ ^(raw|vbox|vmx|esxi|hyperv|utm|proxmox|all)$ ]] || Error_Exit "Invalid virtual machine type \"$VMTYPE\" passed, aborting ..."
+	[[ $VMTYPE && ( $ITYPE == 'Installer' || $PTTYPE == 'gpt' ) ]] || Error_Exit 'The VM type option "-v" cannot be combined with "-i" or "-p gpt", since installer images result in an ISO, instead of a virtual disk image or appliance, and GPT partition table x86_64 images are forcefully installer images. Aborting ...'
 fi
 
 [[ $EDITION =~ ^(|Amiberry|AlloGUI|all)$ ]] || { G_DIETPI-NOTIFY 1 "Invalid edition \"$EDITION\" passed, aborting..."; exit 1; }
@@ -197,7 +198,7 @@ esac
 
 case $PTTYPE in
 	'msdos') :;;
-	'gpt') [[ $HW_MODEL == 21 ]] && efi_size=64 iname='NativePC-UEFI' ITYPE='Installer';;
+	'gpt') [[ $HW_ARCH == 10 ]] && efi_size=64 iname="${iname%-BIOS}-UEFI" ITYPE='Installer';;
 	*) G_DIETPI-NOTIFY 1 "Invalid partition table type \"$PTTYPE\" passed, aborting..."; exit 1;;
 esac
 
diff --git a/.github/workflows/armbian.yml b/.github/workflows/armbian.yml
index e4fef8ee6d..618d1ccbf8 100644
--- a/.github/workflows/armbian.yml
+++ b/.github/workflows/armbian.yml
@@ -11,7 +11,7 @@ on:
       branch:
         description: 'Branch'
         type: choice
-        options: [legacy, current, edge, vendor, collabora]
+        options: [legacy, vendor, current, edge]
         default: current
         required: true
       board: