diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml
index ea31ad0d..4ad61497 100644
--- a/.github/workflows/issues.yml
+++ b/.github/workflows/issues.yml
@@ -235,6 +235,14 @@ jobs:
             convertova "rr/rr.img" "rr/rr.ova"
             (cd rr; sha256sum rr.ova >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.ova.zip" -j rr/rr.ova sha256sum
+          elif [ "${{ env.format }}" = "vmdk" ]; then
+            qemu-img convert rr/rr.img -O vmdk -o 'adapter_type=lsilogic,subformat=streamOptimized,compat6' rr/rr.vmdk
+            (cd rr; sha256sum rr.vmdk >../sha256sum)
+            zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vmdk.zip" -j rr/rr.vmdk sha256sum
+          elif [ "${{ env.format }}" = "vhdx" ]; then
+            qemu-img convert rr/rr.img -O vhdx -o subformat=dynamic rr/rr.vhdx
+            (cd rr; sha256sum rr.vhdx >../sha256sum)
+            zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.vhdx.zip" -j rr/rr.vhdx sha256sum
           else
             (cd rr; sha256sum rr.img >../sha256sum)
             zip -9 "rr-${MODEL}-${TAG}-${{ github.run_id }}.img.zip" -j rr/rr.img sha256sum
diff --git a/docs/issues.html b/docs/issues.html
index 8fd5ced5..ce68ec81 100644
--- a/docs/issues.html
+++ b/docs/issues.html
@@ -266,6 +266,8 @@
                     value="">
                     <option selected="selected" value="img">img</option>
                     <option value="ova">ova</option>
+                    <option value="vmdk">vmdk</option>
+                    <option value="vhdx">vhdx</option>
                 </select>
             </div>
         </div>
diff --git a/localbuild.sh b/localbuild.sh
index ddaadefd..1f88f06a 100755
--- a/localbuild.sh
+++ b/localbuild.sh
@@ -34,7 +34,7 @@ function create() {
   fi
 
   sudo apt update
-  sudo apt install -y locales busybox dialog curl xz-utils cpio sed
+  sudo apt install -y locales busybox dialog curl xz-utils cpio sed qemu-utils
   sudo locale-gen ar_SA.UTF-8 de_DE.UTF-8 en_US.UTF-8 es_ES.UTF-8 fr_FR.UTF-8 ja_JP.UTF-8 ko_KR.UTF-8 ru_RU.UTF-8 th_TH.UTF-8 tr_TR.UTF-8 uk_UA.UTF-8 vi_VN.UTF-8 zh_CN.UTF-8 zh_HK.UTF-8 zh_TW.UTF-8
 
   YQ=$(command -v yq)