diff --git a/nixos/maintainers/scripts/ec2/amazon-image.nix b/nixos/maintainers/scripts/ec2/amazon-image.nix
index a192b91196de..e0bb2b6d50ef 100644
--- a/nixos/maintainers/scripts/ec2/amazon-image.nix
+++ b/nixos/maintainers/scripts/ec2/amazon-image.nix
@@ -88,7 +88,7 @@ in
 
   config.system.nixos.tags = [ "amazon" ];
   config.system.build.image = config.system.build.amazonImage;
-  config.image.extension = cfg.format;
+  config.image.extension = if cfg.format == "vpc" then "vhd" else cfg.format;
 
   config.system.build.amazonImage =
     let
diff --git a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
index 869d5a3c1fc3..2e7cd481584a 100644
--- a/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
+++ b/nixos/maintainers/scripts/openstack/openstack-image-zfs.nix
@@ -113,7 +113,7 @@ in
       postVM = ''
          extension=''${rootDiskImage##*.}
          friendlyName=$out/${config.image.baseName}
-         rootDisk="$friendlyName.root.$extension"
+         rootDisk="$friendlyName.$extension"
          mv "$rootDiskImage" "$rootDisk"
 
          mkdir -p $out/nix-support
diff --git a/nixos/modules/installer/sd-card/sd-image.nix b/nixos/modules/installer/sd-card/sd-image.nix
index d9eec037c99d..cba5f3e8e882 100644
--- a/nixos/modules/installer/sd-card/sd-image.nix
+++ b/nixos/modules/installer/sd-card/sd-image.nix
@@ -205,7 +205,7 @@ in
     sdImage.storePaths = [ config.system.build.toplevel ];
 
     image.extension = if config.sdImage.compressImage then "img.zst" else "img";
-    image.filePath = "sd-card/${config.image.fileName}";
+    image.filePath = "sd-image/${config.image.fileName}";
     system.nixos.tags = [ "sd-card" ];
     system.build.image = config.system.build.sdImage;
     system.build.sdImage = pkgs.callPackage (
diff --git a/nixos/modules/virtualisation/disk-image.nix b/nixos/modules/virtualisation/disk-image.nix
index c524b6627113..40eea6b1237b 100644
--- a/nixos/modules/virtualisation/disk-image.nix
+++ b/nixos/modules/virtualisation/disk-image.nix
@@ -50,7 +50,7 @@ in
     };
 
     system.nixos.tags = [ cfg.format ] ++ lib.optionals cfg.efiSupport [ "efi" ];
-    image.extension = cfg.format;
+    image.extension = if cfg.format == "raw" then "img" else cfg.format;
     system.build.image = import ../../lib/make-disk-image.nix {
       inherit lib config pkgs;
       inherit (config.virtualisation) diskSize;