diff --git a/opennebula/remotes/datastore/vitastor/snap_flatten b/opennebula/remotes/datastore/vitastor/snap_flatten
index 58139bfd..8d064338 100755
--- a/opennebula/remotes/datastore/vitastor/snap_flatten
+++ b/opennebula/remotes/datastore/vitastor/snap_flatten
@@ -59,12 +59,10 @@ if [ -n "$VITASTOR_CONF" ]; then
 fi
 
 SNAP_FLATTEN_CMD=$(cat <<EOF
-    $CLI ls --json ${IMAGE_NAME}@${SNAP_ID} | jq -e 'length > 0'
-    $CLI rm ${IMAGE_NAME}.flatten || true
-    $CLI create --pool "${POOL_NAME}" --parent ${IMAGE_NAME}@${SNAP_ID} ${IMAGE_NAME}.flatten
-    $CLI flatten ${IMAGE_NAME}.flatten
-    $CLI rm ${IMAGE_NAME} || true
-    $CLI modify ${IMAGE_NAME}.flatten --rename ${IMAGE_NAME}
+    set -e
+    $CLI flatten "$IMAGE_NAME@$SNAP_ID"
+    $CLI modify "$IMAGE_NAME@$SNAP_ID" --rename "$IMAGE_NAME"
+    $CLI rm --matching "$IMAGE_NAME@*"
 EOF
 )
 
diff --git a/opennebula/remotes/tm/vitastor/restore b/opennebula/remotes/tm/vitastor/restore
index 0eb19143..81619dba 100755
--- a/opennebula/remotes/tm/vitastor/restore
+++ b/opennebula/remotes/tm/vitastor/restore
@@ -181,11 +181,9 @@ begin
     success_disks.each do |vitastor_disk|
         move = <<~EOS
             set -e
-            #{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:img]} #{info[vitastor_disk][:old]};
-            #{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:bak]} #{info[vitastor_disk][:img]};
-            for i in $(#{info[vitastor_disk][:cli]} ls --json "#{info[vitastor_disk][:img]}@*"); do
-                #{info[vitastor_disk][:cli]} rm "$i"
-            done
+            #{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:img]} #{info[vitastor_disk][:old]}
+            #{info[vitastor_disk][:cli]} mv #{info[vitastor_disk][:bak]} #{info[vitastor_disk][:img]}
+            #{info[vitastor_disk][:cli]} rm --matching "#{info[vitastor_disk][:img]}@*"
             #{info[vitastor_disk][:cli]} rm #{info[vitastor_disk][:old]}
         EOS