diff --git a/lib/main_common.pm b/lib/main_common.pm
index 543d4ac4ae53..9c02a6aca84d 100644
--- a/lib/main_common.pm
+++ b/lib/main_common.pm
@@ -2406,7 +2406,6 @@ sub set_mu_virt_vars {
     set_var('EXTENDED_SECURITY', (get_var('INCIDENT_REPO') =~ /LTSS-Extended-Security/) ? 1 : 0);
     # Set PATCH_WITH_ZYPPER
     set_var('PATCH_WITH_ZYPPER', 1) unless (check_var('PATCH_WITH_ZYPPER', 0));
-    bmwqemu::save_vars();
 }
 
 sub load_hypervisor_tests {
diff --git a/lib/virt_autotest/common.pm b/lib/virt_autotest/common.pm
index 942e357c1a2f..1778ea4d8cd5 100644
--- a/lib/virt_autotest/common.pm
+++ b/lib/virt_autotest/common.pm
@@ -265,7 +265,7 @@ if (get_var("REGRESSION", '') =~ /xen/) {
             name => 'sles15sp6',
         },
     );
-    %guests = get_var('TERADATA') ? %guests{"sles${guest_version}TD"} : check_var('EXTENDED_SECURITY', '1') ? %guests{"sles12sp5ES"} : %guests{"sles${guest_version}"};
+    %guests = get_var('TERADATA') ? %guests{"sles${guest_version}TD"} : (get_var('INCIDENT_REPO') =~ /LTSS-Extended-Security/) ? %guests{"sles${guest_version}ES"} : %guests{"sles${guest_version}"};
 
 } elsif (get_var("REGRESSION", '') =~ /hyperv/) {
     %guests = (
@@ -297,7 +297,7 @@ if (get_var("REGRESSION", '') =~ /xen/) {
             vm_name => 'sles-15.6_openQA-virtualization-maintenance',
         },
     );
-    %guests = get_var('TERADATA') ? %guests{"sles${guest_version}TD"} : check_var('EXTENDED_SECURITY', '1') ? %guests{"sles12sp5ES"} : %guests{"sles${guest_version}"};
+    %guests = get_var('TERADATA') ? %guests{"sles${guest_version}TD"} : (get_var('INCIDENT_REPO') =~ /LTSS-Extended-Security/) ? %guests{"sles${guest_version}ES"} : %guests{"sles${guest_version}"};
 }
 
 our %imports = ();    # imports are virtual machines that we don't install but just import. We test those separately.