diff --git a/schedule/yast/maintenance/autoyast_create_hdd_maintenance_migration.yaml b/schedule/yast/maintenance/autoyast_create_hdd_maintenance_migration.yaml
new file mode 100644
index 000000000000..775f28cced5c
--- /dev/null
+++ b/schedule/yast/maintenance/autoyast_create_hdd_maintenance_migration.yaml
@@ -0,0 +1,23 @@
+---
+name: autoyast_create_hdd_maintenance_migration
+schedule:
+  - autoyast/prepare_profile
+  - installation/isosize
+  - installation/bootloader
+  - autoyast/installation
+  - autoyast/console
+  - autoyast/login
+  - autoyast/wicked
+  - autoyast/repos
+  - autoyast/logs
+  - autoyast/autoyast_reboot
+  - installation/grub_test
+  - installation/first_boot
+  - console/system_prepare
+  - qa_automation/patch_and_reboot
+  - console/hostname
+  - console/scc_cleanup_reregister
+  - console/scc_deregistration
+  - shutdown/grub_set_bootargs
+  - shutdown/cleanup_before_shutdown
+  - shutdown/shutdown
diff --git a/schedule/yast/maintenance/offline_migration.yaml b/schedule/yast/maintenance/offline_migration.yaml
new file mode 100644
index 000000000000..206bae0c7429
--- /dev/null
+++ b/schedule/yast/maintenance/offline_migration.yaml
@@ -0,0 +1,37 @@
+name: schedule/yast/maintenance/migration_offline_scc_x86_64.yaml
+description: |
+  This is for offline migraiton tests with MU on x86_64.
+vars:
+  DESKTOP: gnome
+  BOOT_HDD_IMAGE: 1
+  ORIGIN_SYSTEM_VERSION: '%HDDVERSION%'
+  UPGRADE_TARGET_VERSION: '%VERSION%'
+schedule:
+  - migration/version_switch_origin_system
+  - boot/boot_to_desktop
+  - update/patch_sle
+  - console/check_system_info
+  - migration/record_disk_info
+  - migration/reboot_to_upgrade
+  - migration/version_switch_upgrade_target
+  - installation/bootloader
+  - installation/welcome
+  - installation/upgrade_select
+  - installation/scc_registration
+  - installation/addon_products_sle
+  - installation/resolve_dependency_issues
+  - 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
+  - migration/post_upgrade
+  - console/system_prepare
+  - console/consoletest_setup
+  - console/zypper_lr
+  - console/check_os_release
+  - console/check_system_info
+  - console/hostname
diff --git a/tests/installation/addon_products_sle.pm b/tests/installation/addon_products_sle.pm
index 9fc0c9019b77..d723e3e9caac 100644
--- a/tests/installation/addon_products_sle.pm
+++ b/tests/installation/addon_products_sle.pm
@@ -148,7 +148,7 @@ sub run {
     my ($self) = @_;
 
     if (get_var('SKIP_INSTALLER_SCREEN', 0)) {
-        advance_installer_window('inst-addon');
+        advance_installer_window('inst-addon') unless get_var('UPGRADE', 0);
         set_var('SKIP_INSTALLER_SCREEN', 0);
     }
     # Wait for the addon products screen if needed