diff --git a/templates/kiss/matchbox/boot/rocky9.ks b/templates/kiss/matchbox/boot/rocky9.ks
index f985500e..f8a63505 100644
--- a/templates/kiss/matchbox/boot/rocky9.ks
+++ b/templates/kiss/matchbox/boot/rocky9.ks
@@ -86,7 +86,7 @@ ROOTDEV=""
 ROOTSIZE=1000000000
 
 # Remove all LVM partitions
-dmsetup remove_all --force
+dmsetup remove_all
 
 # /sys/block/*/size is in 512 byte chunks
 for DEV in $(lsblk -d | sed 's/^\(nvme[0-9]\+n[0-9]\+\)\?\([sv]d[a-z]\+\)\?.*$/\1\2/g' | xargs); do
diff --git a/templates/kiss/tasks/commission/storage-cleanup-device.yaml b/templates/kiss/tasks/commission/storage-cleanup-device.yaml
index 88a4101a..6cef7be8 100644
--- a/templates/kiss/tasks/commission/storage-cleanup-device.yaml
+++ b/templates/kiss/tasks/commission/storage-cleanup-device.yaml
@@ -19,7 +19,7 @@
         force: true
 
     - name: Unregister all logical devices
-      command: dmsetup remove_all --force
+      command: dmsetup remove_all
 
     - name: Update facts
       setup: