diff --git a/package/yast2-storage-ng.changes b/package/yast2-storage-ng.changes
index 3aff342ff..2a6aa342a 100644
--- a/package/yast2-storage-ng.changes
+++ b/package/yast2-storage-ng.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Mar 12 13:57:30 UTC 2024 - Stefan Hundhammer <shundhammer@suse.com>
+
+- Fix unlimited-sized fake device graphs (bsc#1221222)
+- 5.0.9
+
 -------------------------------------------------------------------
 Thu Mar  7 16:26:04 UTC 2024 - José Iván López González <jlopez@suse.com>
 
diff --git a/package/yast2-storage-ng.spec b/package/yast2-storage-ng.spec
index f01c1d17f..5591bd9c5 100644
--- a/package/yast2-storage-ng.spec
+++ b/package/yast2-storage-ng.spec
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-storage-ng
-Version:        5.0.8
+Version:        5.0.9
 Release:        0
 Summary:        YaST2 - Storage Configuration
 License:        GPL-2.0-only OR GPL-3.0-only
diff --git a/test/data/devicegraphs/autoyast_drive_examples.yml b/test/data/devicegraphs/autoyast_drive_examples.yml
index b28e57c9e..f697a1ed5 100644
--- a/test/data/devicegraphs/autoyast_drive_examples.yml
+++ b/test/data/devicegraphs/autoyast_drive_examples.yml
@@ -415,7 +415,7 @@
           blk_device: /dev/sdj1
     lvm_lvs:
       - lvm_lv:
-          size:         unlimited
+          size:         1 TiB
           lv_name:      lv1
           file_system:  btrfs
           mount_point:  /
@@ -434,7 +434,7 @@
           blk_device: /dev/sdj2
     lvm_lvs:
       - lvm_lv:
-          size:         unlimited
+          size:         1 TiB
           lv_name:      lv1
           file_system:  btrfs
           mount_point:  /
diff --git a/test/data/devicegraphs/dos_lvm.yml b/test/data/devicegraphs/dos_lvm.yml
index 3524ad173..728a34e32 100644
--- a/test/data/devicegraphs/dos_lvm.yml
+++ b/test/data/devicegraphs/dos_lvm.yml
@@ -19,7 +19,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/dos_lvm_boot_partition.yml b/test/data/devicegraphs/dos_lvm_boot_partition.yml
index 433f0b7bc..1754aa134 100644
--- a/test/data/devicegraphs/dos_lvm_boot_partition.yml
+++ b/test/data/devicegraphs/dos_lvm_boot_partition.yml
@@ -25,7 +25,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/lvm-striped-lvs.yml b/test/data/devicegraphs/lvm-striped-lvs.yml
index a85c9f203..82597e63d 100644
--- a/test/data/devicegraphs/lvm-striped-lvs.yml
+++ b/test/data/devicegraphs/lvm-striped-lvs.yml
@@ -31,7 +31,7 @@
             blk_device: /dev/sdb1
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         100 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/lvm-two-disks.yml b/test/data/devicegraphs/lvm-two-disks.yml
index 6dcc0ae83..950c6edc9 100644
--- a/test/data/devicegraphs/lvm-two-disks.yml
+++ b/test/data/devicegraphs/lvm-two-disks.yml
@@ -31,7 +31,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         400 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/lvm_with_bios_boot.yml b/test/data/devicegraphs/lvm_with_bios_boot.yml
index c59318b8e..a6e7c0679 100644
--- a/test/data/devicegraphs/lvm_with_bios_boot.yml
+++ b/test/data/devicegraphs/lvm_with_bios_boot.yml
@@ -23,7 +23,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/lvm_with_boot.yml b/test/data/devicegraphs/lvm_with_boot.yml
index 3c57e25d2..364d55f0b 100644
--- a/test/data/devicegraphs/lvm_with_boot.yml
+++ b/test/data/devicegraphs/lvm_with_boot.yml
@@ -24,7 +24,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/prep_lvm.yml b/test/data/devicegraphs/prep_lvm.yml
index dd15e190c..c4ecd8e48 100644
--- a/test/data/devicegraphs/prep_lvm.yml
+++ b/test/data/devicegraphs/prep_lvm.yml
@@ -23,7 +23,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/trivial_lvm.yml b/test/data/devicegraphs/trivial_lvm.yml
index 86f3fc904..1611f15e0 100644
--- a/test/data/devicegraphs/trivial_lvm.yml
+++ b/test/data/devicegraphs/trivial_lvm.yml
@@ -18,7 +18,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /
diff --git a/test/data/devicegraphs/trivial_lvm_and_other_partitions.yml b/test/data/devicegraphs/trivial_lvm_and_other_partitions.yml
index 49a6ecb72..b65d2b587 100644
--- a/test/data/devicegraphs/trivial_lvm_and_other_partitions.yml
+++ b/test/data/devicegraphs/trivial_lvm_and_other_partitions.yml
@@ -53,7 +53,7 @@
 
     lvm_lvs:
         - lvm_lv:
-            size:         unlimited
+            size:         200 GiB
             lv_name:      lv1
             file_system:  btrfs
             mount_point:  /