diff --git a/tasks/main-blivet.yml b/tasks/main-blivet.yml
index 4f24cb63..fd0d60d4 100644
--- a/tasks/main-blivet.yml
+++ b/tasks/main-blivet.yml
@@ -195,8 +195,8 @@
     state: "{{ entry.state }}"
     create: true
     mode: "{{ __storage_crypttab.stat.mode | d('0600') }}"
-    owner: "{{ __storage_crypttab.stat.owner | d('root') }}"
-    group: "{{ __storage_crypttab.stat.group | d('root') }}"
+    owner: "{{ __storage_crypttab.stat.pw_name | d('root') }}"
+    group: "{{ __storage_crypttab.stat.gr_name | d('root') }}"
   loop: "{{ blivet_output.crypts }}"
   loop_control:
     loop_var: entry
diff --git a/tests/tests_raid_volume_cleanup_nvme_generated.yml b/tests/tests_raid_volume_cleanup_nvme_generated.yml
new file mode 100644
index 00000000..08285ba0
--- /dev/null
+++ b/tests/tests_raid_volume_cleanup_nvme_generated.yml
@@ -0,0 +1,15 @@
+---
+# This file was generated by generate_tests.py
+- name: Run test tests_raid_volume_cleanup.yml for nvme
+  hosts: all
+  tags:
+    - tests::nvme
+  tasks:
+    - name: Set disk interface for test
+      set_fact:
+        storage_test_use_interface: "nvme"
+
+- name: Import playbook
+  import_playbook: tests_raid_volume_cleanup.yml
+  tags:
+    - tests::nvme
diff --git a/tests/tests_raid_volume_cleanup_scsi_generated.yml b/tests/tests_raid_volume_cleanup_scsi_generated.yml
new file mode 100644
index 00000000..99334ba5
--- /dev/null
+++ b/tests/tests_raid_volume_cleanup_scsi_generated.yml
@@ -0,0 +1,15 @@
+---
+# This file was generated by generate_tests.py
+- name: Run test tests_raid_volume_cleanup.yml for scsi
+  hosts: all
+  tags:
+    - tests::scsi
+  tasks:
+    - name: Set disk interface for test
+      set_fact:
+        storage_test_use_interface: "scsi"
+
+- name: Import playbook
+  import_playbook: tests_raid_volume_cleanup.yml
+  tags:
+    - tests::scsi