diff --git a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
index 724c220abaf8..4b966bd431ef 100644
--- a/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
+++ b/nixos/maintainers/scripts/cloudstack/cloudstack-image.nix
@@ -8,10 +8,19 @@
 }:
 
 {
-  imports = [ ../../../modules/virtualisation/cloudstack-config.nix ];
+  imports = [
 
+    ../../../modules/virtualisation/cloudstack-config.nix
+    ../../../modules/image/file-options.nix
+  ];
+
+  system.nixos.tags = [ "cloudstack" ];
+  image.extension = "qcow2";
+  system.build.image = config.system.build.cloudstackImage;
   system.build.cloudstackImage = import ../../../lib/make-disk-image.nix {
     inherit lib config pkgs;
+    inherit (config.virtualisation) diskSize;
+    baseName = config.image.baseName;
     format = "qcow2";
     configFile = pkgs.writeText "configuration.nix" ''
       {
diff --git a/nixos/modules/image/images.nix b/nixos/modules/image/images.nix
index f3cdde327d36..b0f86ed5c455 100644
--- a/nixos/modules/image/images.nix
+++ b/nixos/modules/image/images.nix
@@ -11,6 +11,7 @@ let
   imageModules = {
     amazon = ../../maintainers/scripts/ec2/amazon-image.nix;
     azure = ../virtualisation/azure-image.nix;
+    cloudstack = ../../maintainers/scripts/cloudstack/cloudstack-image.nix;
     digital-ocean = ../virtualisation/digital-ocean-image.nix;
     google-compute = ../virtualisation/google-compute-image.nix;
     hyperv = ../virtualisation/hyperv-image.nix;
diff --git a/nixos/modules/virtualisation/cloudstack-config.nix b/nixos/modules/virtualisation/cloudstack-config.nix
index 7df3c9c613b4..bb08b68a8d39 100644
--- a/nixos/modules/virtualisation/cloudstack-config.nix
+++ b/nixos/modules/virtualisation/cloudstack-config.nix
@@ -8,9 +8,10 @@ with lib;
   ];
 
   config = {
-    fileSystems."/" = {
+    fileSystems."/" = lib.mkImageMediaOverride {
       device = "/dev/disk/by-label/nixos";
       autoResize = true;
+      fsType = "ext4";
     };
 
     boot.growPartition = true;