diff --git a/job_groups/opensuse_leap_15.yaml b/job_groups/opensuse_leap_15.yaml
index fc1c395a..19804a7c 100644
--- a/job_groups/opensuse_leap_15.yaml
+++ b/job_groups/opensuse_leap_15.yaml
@@ -543,6 +543,7 @@ scenarios:
             PUBLISH_HDD_1: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-cryptlvm@%MACHINE%.qcow2'
             PUBLISH_PFLASH_VARS: '%DISTRI%-%VERSION%-%ARCH%-%BUILD%-cryptlvm@%MACHINE%-uefi-vars.qcow2'
             QEMU_COMPRESS_QCOW2: '1'
+            GRUB_KERNEL_OPTION_APPEND: ''
           description: ''
           testsuite: null
       - extra_tests_on_kde
@@ -601,11 +602,12 @@ scenarios:
             YAML_TEST_DATA: test_data/yast/encryption/lvm_encrypt_separate_boot_uefi.yaml
       - lvm-full-encrypt:
           settings:
-            YAML_TEST_DATA: test_data/yast/encryption/lvm_encrypt_separate_boot_uefi.yaml
+            YAML_TEST_DATA: test_data/yast/encryption/full_lvm_enc_uefi.yaml
+            GRUB_KERNEL_OPTION_APPEND: ''
       - lvm_thin_provisioning:
           settings:
             YAML_SCHEDULE: schedule/yast/opensuse/lvm/lvm_thin_provisioning.yaml
-            YAML_TEST_DATA: test_data/yast/encryption/lvm_encrypt_separate_boot_uefi.yaml
+            YAML_TEST_DATA: test_data/yast/lvm_thin_provisioning/lvm_thin_provisioning_uefi.yaml
       - apparmor
       - zdup-Leap-15.2-gnome:
           settings:
@@ -673,7 +675,9 @@ scenarios:
       - RAID1_gpt_uefi
       - RAID5_gpt_uefi
       - RAID10_gpt_uefi
-      - cryptlvm
+      - cryptlvm:
+          settings:
+            GRUB_KERNEL_OPTION_APPEND: ''
       - install_only:
           machine: aarch64
       - create_hdd_minimalx:
diff --git a/job_groups/opensuse_tumbleweed_aarch64.yaml b/job_groups/opensuse_tumbleweed_aarch64.yaml
index d946cfd0..2422a457 100644
--- a/job_groups/opensuse_tumbleweed_aarch64.yaml
+++ b/job_groups/opensuse_tumbleweed_aarch64.yaml
@@ -590,6 +590,7 @@ scenarios:
       - cryptlvm:
           settings:
             YAML_SCHEDULE: schedule/yast/opensuse/encryption/cryptlvm.yaml
+            GRUB_KERNEL_OPTION_APPEND: ''
       - install_only:
           machine: aarch64
       - install_only: