diff --git a/job_groups/opensuse_leap_15.6_wsl.yaml b/job_groups/opensuse_leap_15.6_wsl.yaml
index 3e34c58a..dc08082a 100644
--- a/job_groups/opensuse_leap_15.6_wsl.yaml
+++ b/job_groups/opensuse_leap_15.6_wsl.yaml
@@ -22,46 +22,45 @@ scenarios:
     opensuse-15.6-WSL-x86_64:
       - wsl-main:
           testsuite: null
-          settings: &settings
-            BOOT_HDD_IMAGE: '1'
-            QEMURAM: '2048'
-            QEMUVGA: 'qxl'
-            QEMUMACHINE: 'q35'
-            SCC_REGISTER: '0'
+          description: |
+            Basic WSL test Test scope:
+                1) Prepare WSL and other features in Windows
+                2) Download the image
+                3) Import embedded certificate from the image
+                4) Load image
+                5) Define users
+                6) Register SUT
+                7) Exit WSL
+          machine: [win10_64bit, win10_uefi, win11_uefi]
+          settings:
             YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
-            HDD_1: 'windows-10-x86_64-21H2@64bit_win.qcow2'
-            WIN_VERSION: '10'
-            VNC_STALL_THRESHOLD: '10'
-            VNC_TYPING_LIMIT: '15'
-            QEMU_ENABLE_SMBD: '1'
             WSL_INSTALL_FROM: 'build'
-      - wsl-main:
-          testsuite: null
-          machine: uefi_win
-          settings:
-            <<: *settings
-            HDD_1: 'windows-10-x86_64-21H2@uefi_win.qcow2'
+            QEMU_ENABLE_SMBD: '1'
       - wsl2-main:
           testsuite: null
+          machine: [win10_64bit, win10_uefi, win11_uefi]
           settings:
-            <<: *settings
+            YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
+            WSL_INSTALL_FROM: 'build'
+            QEMU_ENABLE_SMBD: '1'
             WSL2: '1'
-            QEMURAM: '4096'
             QEMUCPU: 'host,kvm=off,vmx=on,hypervisor=off,hv_time,hv_relaxed,hv_vapic,hv_spinlocks=0x1fff,hv_frequencies,hv_reenlightenment,hv_vpindex,hv-synic,hv-stimer,hv-stimer-direct'
             QEMUMACHINE: 'q35,accel=whpx'
-            QEMUCPUS: '2'
-            WORKER_CLASS: 'openqaworker7'
-    # to be re-enabled after GA, when 15.6 is available in the Store.
-    #  - wsl-install-MSStore-Leap15.6:
-    #      testsuite: null
-    #      description: |
-    #        Basic WSL test Test scope:
-    #            1) Prepare WSL and other features in Windows
-    #            2) Download the winget utility and install it
-    #            3) Install WSL image from the MS Store via CLI
-    #      settings:
-    #        <<: *settings
-    #        WSL_VERSION: 'openSUSE Leap 15.6'
-    #        WSL_INSTALL_FROM: 'msstore'
-    #        QEMURAM: '4096'
-    #        QEMUCPUS: '2'
+            WORKER_CLASS: 'wsl2'
+      # to be re-enabled after GA, when 15.6 is available in the Store.
+      # - wsl2-install-msstore:
+      #     testsuite: null
+      #     machine: [win10_64bit, win10_uefi, win11_uefi]
+      #     description: |
+      #       Basic WSL test Test scope:
+      #           1) Prepare WSL and other features in Windows
+      #           2) Download the winget utility and install it
+      #           3) Install WSL image from the MS Store via CLI
+      #     settings:
+      #       YAML_SCHEDULE: 'schedule/wsl/wsl_main.yaml'
+      #       WSL2: '1'
+      #       QEMUCPU: 'host,kvm=off,vmx=on,hypervisor=off,hv_time,hv_relaxed,hv_vapic,hv_spinlocks=0x1fff,hv_frequencies,hv_reenlightenment,hv_vpindex,hv-synic,hv-stimer,hv-stimer-direct'
+      #       QEMUMACHINE: 'q35,accel=whpx'
+      #       WORKER_CLASS: 'wsl2'
+      #       WSL_VERSION: 'openSUSE Leap 15.6'
+      #       WSL_INSTALL_FROM: 'msstore'