diff --git a/modules/amazon-image.nix b/modules/amazon-image.nix
index f33623a..89cdc10 100644
--- a/modules/amazon-image.nix
+++ b/modules/amazon-image.nix
@@ -13,13 +13,13 @@ in
     pkgs.runCommand config.system.build.image.name { } ''
       mkdir -p $out
       mkdir -p $out/nix-support
-      ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O vpc ${config.system.build.image}/image.raw $out/image.vhd
+      ${pkgs.qemu-utils}/bin/qemu-img convert -f raw -O vpc ${config.system.build.image}/${config.image.repart.imageFile} $out/${config.image.repart.imageFileBasename}.vhd
       cat <<EOF > $out/nix-support/image-info.json
       {
         "boot_mode": "uefi",
         "label": "${config.system.nixos.label}",
         "system": "${pkgs.stdenv.hostPlatform.system}",
-        "file": "$out/image.vhd"
+        "file": "$out/${config.image.repart.imageFileBasename}.vhd"
       }
       EOF
     '';