diff --git a/flake.nix b/flake.nix
index 09d51d24..afe1ed96 100644
--- a/flake.nix
+++ b/flake.nix
@@ -40,5 +40,20 @@
       system = "x86_64-linux";
       user   = "mitchellh";
     };
+
+    # Use this to prepare a new VMWare image.
+    #
+    # $ nix build .#vmwareImage -L
+    # $ open ./result/*.vmdk
+    #
+    packages.aarch64-linux = {
+      vmwareImage =
+        self.nixosConfigurations.vm-aarch64.config.system.build.vmwareImage;
+    };
+
+    packages.x86_64-linux = {
+      vmwareImage =
+        self.nixosConfigurations.vm-intel.config.system.build.vmwareImage;
+    };
   };
 }
diff --git a/hardware/vm-intel.nix b/hardware/vm-intel.nix
index 45298e1e..7723debf 100644
--- a/hardware/vm-intel.nix
+++ b/hardware/vm-intel.nix
@@ -4,7 +4,7 @@
 { config, lib, pkgs, modulesPath, ... }:
 
 {
-  imports = [ ];
+  imports = [ "${modulesPath}/virtualisation/vmware-image.nix" ];
 
   boot.initrd.availableKernelModules = [
     "ata_piix" "mptspi" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod" ];
@@ -12,16 +12,6 @@
   boot.kernelModules = [ ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
-    { device = "/dev/disk/by-label/nixos";
-      fsType = "ext4";
-    };
-
-  fileSystems."/boot" =
-    { device = "/dev/disk/by-label/boot";
-      fsType = "vfat";
-    };
-
   swapDevices = [ ];
 
 }