diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 6a320b8cc4a3..5a700f070b62 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -870,6 +870,7 @@ in
     # Create the ISO image.
     image.extension = if config.isoImage.compressImage then "iso.zst" else "iso";
     image.filePath = "iso/${config.image.fileName}";
+    image.baseName = "nixos${lib.optionalString (config.isoImage.edition != "") "-${config.isoImage.edition}" }-${config.system.nixos.label}-${pkgs.stdenv.hostPlatform.system}";
     system.build.image = config.system.build.isoImage;
     system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({
       inherit (config.isoImage) compressImage volumeID contents;
diff --git a/nixos/release.nix b/nixos/release.nix
index 69abef4b982d..7c843173ecc4 100644
--- a/nixos/release.nix
+++ b/nixos/release.nix
@@ -61,9 +61,7 @@ let
 
     hydraJob ((import lib/eval-config.nix {
       inherit system;
-      modules = makeModules module {
-        image.baseName = "nixos-${type}";
-      };
+      modules = makeModules module { };
     }).config.system.build.isoImage);