diff --git a/schedule/yast/raid/raid0_opensuse_gpt.yaml b/schedule/yast/raid/raid0_opensuse_gpt.yaml
index f9485da077d6..ec5ab8bfb749 100644
--- a/schedule/yast/raid/raid0_opensuse_gpt.yaml
+++ b/schedule/yast/raid/raid0_opensuse_gpt.yaml
@@ -19,7 +19,6 @@ schedule:
   - installation/user_settings
   - installation/resolve_dependency_issues
   - installation/select_patterns_and_packages
-  - installation/resolve_dependency_issues
   - installation/installation_overview
   - installation/disable_grub_timeout
   - installation/start_install
diff --git a/schedule/yast/raid/raid0_opensuse_gpt_uefi.yaml b/schedule/yast/raid/raid0_opensuse_gpt_uefi.yaml
new file mode 100644
index 000000000000..fd85b294c970
--- /dev/null
+++ b/schedule/yast/raid/raid0_opensuse_gpt_uefi.yaml
@@ -0,0 +1,36 @@
+name:           RAID0_opensuse_gpt_uefi
+description:    >
+  Configure RAID 0 on the disks with GPT partition tables and UEFI using Expert Partitioner.
+  Creates EFI boot, root and swap partitions on each of the 4 disks and then uses
+  them for RAID 0.
+vars:
+  RAIDLEVEL: 0
+schedule:
+  - installation/isosize
+  - installation/bootloader_start
+  - installation/welcome
+  - installation/online_repos
+  - installation/installation_mode
+  - installation/logpackages
+  - installation/system_role
+  - installation/partitioning
+  - installation/partitioning/raid_gpt
+  - installation/installer_timezone
+  - installation/user_settings
+  - installation/resolve_dependency_issues
+  - installation/select_patterns_and_packages
+  - installation/installation_overview
+  - installation/disable_grub_timeout
+  - installation/start_install
+  - installation/await_install
+  - installation/logs_from_installation_system
+  - installation/reboot_after_installation
+  - installation/grub_test
+  - installation/first_boot
+  - console/hostname
+  - console/system_prepare
+  - console/force_scheduled_tasks
+  - shutdown/grub_set_bootargs
+  - console/validate_raid
+test_data:
+  !include: test_data/yast/raid/raid0_gpt_uefi_test_data.yaml
\ No newline at end of file
diff --git a/schedule/yast/raid/raid0_sle_gpt_uefi.yaml b/schedule/yast/raid/raid0_sle_gpt_uefi.yaml
index 1c8a7bef92df..3e4ada12d4d9 100644
--- a/schedule/yast/raid/raid0_sle_gpt_uefi.yaml
+++ b/schedule/yast/raid/raid0_sle_gpt_uefi.yaml
@@ -33,4 +33,4 @@ schedule:
   - shutdown/grub_set_bootargs
   - console/validate_raid
 test_data:
-  !include: test_data/yast/raid/raid_gpt_uefi_test_data.yaml
+  !include: test_data/yast/raid/raid0_gpt_uefi_test_data.yaml
diff --git a/schedule/yast/raid/raid10_opensuse_gpt.yaml b/schedule/yast/raid/raid10_opensuse_gpt.yaml
index 16aed2b0bbd2..1c656adb7f55 100644
--- a/schedule/yast/raid/raid10_opensuse_gpt.yaml
+++ b/schedule/yast/raid/raid10_opensuse_gpt.yaml
@@ -19,7 +19,6 @@ schedule:
   - installation/user_settings
   - installation/resolve_dependency_issues
   - installation/select_patterns_and_packages
-  - installation/resolve_dependency_issues
   - installation/installation_overview
   - installation/disable_grub_timeout
   - installation/start_install
diff --git a/schedule/yast/raid/raid10_opensuse_gpt_uefi.yaml b/schedule/yast/raid/raid10_opensuse_gpt_uefi.yaml
new file mode 100644
index 000000000000..c82a7918e9bc
--- /dev/null
+++ b/schedule/yast/raid/raid10_opensuse_gpt_uefi.yaml
@@ -0,0 +1,35 @@
+name:           RAID10_gpt_uefi
+description:    >
+  Configure RAID 10 on the disks with GPT partition tables and UEFI using Expert Partitioner.
+  Creates EFI boot, root and swap partitions on each of the 4 disks and then uses
+  them for RAID 10.
+vars:
+  RAIDLEVEL: 10
+schedule:
+  - installation/bootloader_start
+  - installation/welcome
+  - installation/online_repos
+  - installation/installation_mode
+  - installation/logpackages
+  - installation/system_role
+  - installation/partitioning
+  - installation/partitioning/raid_gpt
+  - installation/installer_timezone
+  - installation/user_settings
+  - installation/resolve_dependency_issues
+  - installation/select_patterns_and_packages
+  - installation/installation_overview
+  - installation/disable_grub_timeout
+  - installation/start_install
+  - installation/await_install
+  - installation/logs_from_installation_system
+  - installation/reboot_after_installation
+  - installation/grub_test
+  - installation/first_boot
+  - console/hostname
+  - console/system_prepare
+  - console/force_scheduled_tasks
+  - shutdown/grub_set_bootargs
+  - console/validate_raid
+test_data:
+  !include: test_data/yast/raid/raid10_gpt_uefi_test_data.yaml
diff --git a/schedule/yast/raid/raid10_sle_gpt_uefi.yaml b/schedule/yast/raid/raid10_sle_gpt_uefi.yaml
index a84a1e3be907..0877cb6d7f98 100644
--- a/schedule/yast/raid/raid10_sle_gpt_uefi.yaml
+++ b/schedule/yast/raid/raid10_sle_gpt_uefi.yaml
@@ -33,73 +33,4 @@ schedule:
   - shutdown/grub_set_bootargs
   - console/validate_raid
 test_data:
-  disks:
-    - name: vda
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          formatting_options:
-            should_format: 1
-            filesystem: fat
-          mounting_options:
-            should_mount: 1
-            mount_point: '/boot/efi'
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-    - name: vdb
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          id: efi
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-    - name: vdc
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          id: efi
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-    - name: vdd
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          id: efi
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-  mds:
-    - raid_level: 10
-      chunk_size: 64
-      device_selection_step: 2
-      partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
-    - raid_level: 10
-      chunk_size: 64
-      device_selection_step: 1
-      partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+  !include: test_data/yast/raid/raid10_gpt_uefi_test_data.yaml
diff --git a/schedule/yast/raid/raid1_opensuse_gpt.yaml b/schedule/yast/raid/raid1_opensuse_gpt.yaml
index aa600efae954..f6d4745da396 100644
--- a/schedule/yast/raid/raid1_opensuse_gpt.yaml
+++ b/schedule/yast/raid/raid1_opensuse_gpt.yaml
@@ -19,7 +19,6 @@ schedule:
   - installation/user_settings
   - installation/resolve_dependency_issues
   - installation/select_patterns_and_packages
-  - installation/resolve_dependency_issues
   - installation/installation_overview
   - installation/disable_grub_timeout
   - installation/start_install
diff --git a/schedule/yast/raid/raid1_opensuse_gpt_uefi.yaml b/schedule/yast/raid/raid1_opensuse_gpt_uefi.yaml
new file mode 100644
index 000000000000..bbe019f5e3b0
--- /dev/null
+++ b/schedule/yast/raid/raid1_opensuse_gpt_uefi.yaml
@@ -0,0 +1,35 @@
+name:           RAID1_gpt_uefi
+description:    >
+  Configure RAID 1 on the disks with GPT partition tables and UEFI using Expert Partitioner.
+  Creates EFI boot, root and swap partitions on each of the 4 disks and then uses
+  them for RAID 1.
+vars:
+  RAIDLEVEL: 1
+schedule:
+  - installation/bootloader_start
+  - installation/welcome
+  - installation/online_repos
+  - installation/installation_mode
+  - installation/logpackages
+  - installation/system_role
+  - installation/partitioning
+  - installation/partitioning/raid_gpt
+  - installation/installer_timezone
+  - installation/user_settings
+  - installation/resolve_dependency_issues
+  - installation/select_patterns_and_packages
+  - installation/installation_overview
+  - installation/disable_grub_timeout
+  - installation/start_install
+  - installation/await_install
+  - installation/logs_from_installation_system
+  - installation/reboot_after_installation
+  - installation/grub_test
+  - installation/first_boot
+  - console/hostname
+  - console/system_prepare
+  - console/force_scheduled_tasks
+  - shutdown/grub_set_bootargs
+  - console/validate_raid
+test_data:
+  !include: test_data/yast/raid/raid1_gpt_uefi_test_data.yaml
\ No newline at end of file
diff --git a/schedule/yast/raid/raid5_opensuse_gpt.yaml b/schedule/yast/raid/raid5_opensuse_gpt.yaml
index 5fd29e336554..373da4553875 100644
--- a/schedule/yast/raid/raid5_opensuse_gpt.yaml
+++ b/schedule/yast/raid/raid5_opensuse_gpt.yaml
@@ -19,7 +19,6 @@ schedule:
   - installation/user_settings
   - installation/resolve_dependency_issues
   - installation/select_patterns_and_packages
-  - installation/resolve_dependency_issues
   - installation/installation_overview
   - installation/disable_grub_timeout
   - installation/start_install
diff --git a/schedule/yast/raid/raid5_opensuse_gpt_uefi.yaml b/schedule/yast/raid/raid5_opensuse_gpt_uefi.yaml
new file mode 100644
index 000000000000..9fa9e950c413
--- /dev/null
+++ b/schedule/yast/raid/raid5_opensuse_gpt_uefi.yaml
@@ -0,0 +1,35 @@
+name:           RAID5_gpt_uefi
+description:    >
+  Configure RAID 5 on the disks with GPT partition tables and UEFI using Expert Partitioner.
+  Creates EFI boot, root and swap partitions on each of the 4 disks and then uses
+  them for RAID 5.
+vars:
+  RAIDLEVEL: 5
+schedule:
+  - installation/bootloader_start
+  - installation/welcome
+  - installation/online_repos
+  - installation/installation_mode
+  - installation/logpackages
+  - installation/system_role
+  - installation/partitioning
+  - installation/partitioning/raid_gpt
+  - installation/installer_timezone
+  - installation/user_settings
+  - installation/resolve_dependency_issues
+  - installation/select_patterns_and_packages
+  - installation/installation_overview
+  - installation/disable_grub_timeout
+  - installation/start_install
+  - installation/await_install
+  - installation/logs_from_installation_system
+  - installation/reboot_after_installation
+  - installation/grub_test
+  - installation/first_boot
+  - console/hostname
+  - console/system_prepare
+  - console/force_scheduled_tasks
+  - shutdown/grub_set_bootargs
+  - console/validate_raid
+test_data:
+  !include: test_data/yast/raid/raid5_gpt_uefi_test_data.yaml
diff --git a/schedule/yast/raid/raid5_sle_gpt_uefi.yaml b/schedule/yast/raid/raid5_sle_gpt_uefi.yaml
index 2bd5a287c198..8efa4493a8c6 100644
--- a/schedule/yast/raid/raid5_sle_gpt_uefi.yaml
+++ b/schedule/yast/raid/raid5_sle_gpt_uefi.yaml
@@ -33,73 +33,4 @@ schedule:
   - shutdown/grub_set_bootargs
   - console/validate_raid
 test_data:
-  disks:
-    - name: vda
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          formatting_options:
-            should_format: 1
-            filesystem: fat
-          mounting_options:
-            should_mount: 1
-            mount_point: '/boot/efi'
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-    - name: vdb
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          id: efi
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-    - name: vdc
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          id: efi
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-    - name: vdd
-      partitions:
-        - size: 300mb
-          role: raw-volume
-          id: efi
-        - size: 8000mb
-          role: raw-volume
-          id: linux-raid
-        - size: 100mb
-          role: raw-volume
-          id: linux-raid
-  mds:
-    - raid_level: 5
-      chunk_size: 64
-      device_selection_step: 2
-      partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-        mounting_options:
-          should_mount: 1
-    - raid_level: 5
-      chunk_size: 64
-      device_selection_step: 1
-      partition:
-        role: operating-system
-        formatting_options:
-          should_format: 1
-          filesystem: swap
-        mounting_options:
-          should_mount: 1
+  !include: test_data/yast/raid/raid5_gpt_uefi_test_data.yaml
diff --git a/test_data/yast/raid/raid_gpt_uefi_test_data.yaml b/test_data/yast/raid/raid0_gpt_uefi_test_data.yaml
similarity index 100%
rename from test_data/yast/raid/raid_gpt_uefi_test_data.yaml
rename to test_data/yast/raid/raid0_gpt_uefi_test_data.yaml
diff --git a/test_data/yast/raid/raid10_gpt_uefi_test_data.yaml b/test_data/yast/raid/raid10_gpt_uefi_test_data.yaml
new file mode 100644
index 000000000000..46db309ab63f
--- /dev/null
+++ b/test_data/yast/raid/raid10_gpt_uefi_test_data.yaml
@@ -0,0 +1,70 @@
+disks:
+  - name: vda
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        formatting_options:
+          should_format: 1
+          filesystem: fat
+        mounting_options:
+          should_mount: 1
+          mount_point: '/boot/efi'
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdb
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdc
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdd
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+mds:
+  - raid_level: 10
+    chunk_size: 64
+    device_selection_step: 2
+    partition:
+      role: operating-system
+      formatting_options:
+        should_format: 1
+      mounting_options:
+        should_mount: 1
+  - raid_level: 10
+    chunk_size: 64
+    device_selection_step: 1
+    partition:
+      role: operating-system
+      formatting_options:
+        should_format: 1
+        filesystem: swap
+      mounting_options:
+        should_mount: 1
diff --git a/test_data/yast/raid/raid1_gpt_uefi_test_data.yaml b/test_data/yast/raid/raid1_gpt_uefi_test_data.yaml
new file mode 100644
index 000000000000..5dca3a98d300
--- /dev/null
+++ b/test_data/yast/raid/raid1_gpt_uefi_test_data.yaml
@@ -0,0 +1,70 @@
+disks:
+  - name: vda
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        formatting_options:
+          should_format: 1
+          filesystem: fat
+        mounting_options:
+          should_mount: 1
+          mount_point: '/boot/efi'
+      - size: 12500mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdb
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 12500mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdc
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 12500mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdd
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 12500mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+mds:
+  - raid_level: 1
+    chunk_size: 64
+    device_selection_step: 2
+    partition:
+      role: operating-system
+      formatting_options:
+        should_format: 1
+      mounting_options:
+        should_mount: 1
+  - raid_level: 1
+    chunk_size: 64
+    device_selection_step: 1
+    partition:
+      role: operating-system
+      formatting_options:
+        should_format: 1
+        filesystem: swap
+      mounting_options:
+        should_mount: 1
diff --git a/test_data/yast/raid/raid5_gpt_uefi_test_data.yaml b/test_data/yast/raid/raid5_gpt_uefi_test_data.yaml
new file mode 100644
index 000000000000..5d88bc9d59f6
--- /dev/null
+++ b/test_data/yast/raid/raid5_gpt_uefi_test_data.yaml
@@ -0,0 +1,70 @@
+disks:
+  - name: vda
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        formatting_options:
+          should_format: 1
+          filesystem: fat
+        mounting_options:
+          should_mount: 1
+          mount_point: '/boot/efi'
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdb
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdc
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+  - name: vdd
+    partitions:
+      - size: 300mb
+        role: raw-volume
+        id: efi
+      - size: 8000mb
+        role: raw-volume
+        id: linux-raid
+      - size: 100mb
+        role: raw-volume
+        id: linux-raid
+mds:
+  - raid_level: 5
+    chunk_size: 64
+    device_selection_step: 2
+    partition:
+      role: operating-system
+      formatting_options:
+        should_format: 1
+      mounting_options:
+        should_mount: 1
+  - raid_level: 5
+    chunk_size: 64
+    device_selection_step: 1
+    partition:
+      role: operating-system
+      formatting_options:
+        should_format: 1
+        filesystem: swap
+      mounting_options:
+        should_mount: 1