diff --git a/data/yam/autoyast/resize_luks2.xml b/data/yam/autoyast/resize_luks2.xml
index 551af1bc4aa4..cd93beceab5e 100644
--- a/data/yam/autoyast/resize_luks2.xml
+++ b/data/yam/autoyast/resize_luks2.xml
@@ -30,6 +30,7 @@
     <general>
       <mode>
         <confirm config:type="boolean">false</confirm>
+        <final_reboot config:type="boolean">true</final_reboot>
       </mode>
     </general>
     <networking>
diff --git a/tests/autoyast/installation.pm b/tests/autoyast/installation.pm
index 32c3f3ff4d1b..5964918c4441 100644
--- a/tests/autoyast/installation.pm
+++ b/tests/autoyast/installation.pm
@@ -129,7 +129,7 @@ sub run {
     # Autoyast reboot automatically without confirmation, usually assert 'bios-boot' that is not existing on zVM
     # So push a needle to check upcoming reboot on zVM that is a way to indicate the stage done
     # For bsc#1231522, need match reboot popup on powerVM to reboot after installation.
-    push @needles, 'autoyast-stage1-reboot-upcoming' if is_s390x || (is_pvm && !is_upgrade && is_sle('<15-SP7')) || (check_var('VIRSH_VMM_FAMILY', 'xen') && check_var('VIRSH_VMM_TYPE', 'hvm'));
+    push @needles, 'autoyast-stage1-reboot-upcoming' if is_s390x || (is_pvm && !is_upgrade && is_sle('<15-SP7'));
     # Similar situation over IPMI backend, we can check against PXE menu
     push @needles, qw(prague-pxe-menu qa-net-selection) if is_ipmi and !get_var('IPXE');
     # Import untrusted certification for SMT
@@ -178,12 +178,13 @@ sub run {
           || match_has_tag('encrypted-disk-password-prompt'))
     {
         #Verify timeout and continue if there was a match
-        next unless verify_timeout_and_check_screen(($timer += $check_time), \@needles);
-        if (match_has_tag('autoyast-boot')) {
-            send_key 'ret';    # press enter if grub timeout is disabled, like we have in reinstall scenarios
-            last;    # if see grub, we get to the second stage, as it appears after bios-boot which we may miss
-        }
-        elsif (match_has_tag('import-untrusted-gpg-key')) {
+          next unless verify_timeout_and_check_screen(($timer += $check_time), \@needles);
+          if (match_has_tag('autoyast-boot')) {
+              send_key 'ret';    # press enter if grub timeout is disabled, like we have in reinstall scenarios
+                 # if see grub, we get to the second stage, as it appears after bios-boot which we may miss
+              last unless (get_var('EXTRABOOTPARAMS', '') =~ m/startshell=1/);
+          }
+          elsif (match_has_tag('import-untrusted-gpg-key')) {
             handle_untrusted_gpg_key;
             @needles = grep { $_ ne 'import-untrusted-gpg-key' } @needles;
             next;