diff --git a/job_groups/opensuse_leap_15.4_images.yaml b/job_groups/opensuse_leap_15.4_images.yaml
index e9aab6af..42e5c104 100644
--- a/job_groups/opensuse_leap_15.4_images.yaml
+++ b/job_groups/opensuse_leap_15.4_images.yaml
@@ -123,29 +123,29 @@ scenarios:
           machine: 64bit_virtio
     opensuse-Leap15.4-GNOME-Live-x86_64:
       - gnome-live:
-          machine: uefi-2G
+          machine: uefi-3G
       - gnome-live:
-          machine: 64bit-2G
+          machine: 64bit-3G
       - gnome-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
       - gnome-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
       - mediacheck:
           machine: 64bit
     opensuse-Leap15.4-KDE-Live-x86_64:
       - kde-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
       - kde-live:
-          machine: 64bit-2G
+          machine: 64bit-3G
       - kde-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
       - kde-live:
-          machine: uefi-2G
+          machine: uefi-3G
       - mediacheck:
           machine: 64bit
       - kde-live_installation
       - kde-live-wayland:
-          machine: 64bit_virtio-2G
+          machine: 64bit_virtio-3G
       - kde_live_upgrade_leap_42.3
       - kde_live_upgrade_leap_15.0:
           machine: 64bit
@@ -169,9 +169,10 @@ scenarios:
       - mediacheck:
           machine: 64bit
     opensuse-Leap15.4-XFCE-Live-x86_64:
-      - xfce-live
       - xfce-live:
-          machine: uefi-usb-2G
+          machine: 64bit-3G
+      - xfce-live:
+          machine: uefi-usb-4G
       - mediacheck
     opensuse-15.4-Container-Image-x86_64:
       - container_image_on_centos_host:
diff --git a/job_groups/opensuse_leap_15.5_images.yaml b/job_groups/opensuse_leap_15.5_images.yaml
index 539a77b8..0a76cd97 100644
--- a/job_groups/opensuse_leap_15.5_images.yaml
+++ b/job_groups/opensuse_leap_15.5_images.yaml
@@ -108,29 +108,29 @@ scenarios:
           machine: 64bit_virtio
     opensuse-Leap15.5-GNOME-Live-x86_64:
       - gnome-live:
-          machine: uefi-2G
+          machine: uefi-3G
       - gnome-live:
-          machine: 64bit-2G
+          machine: 64bit-3G
       - gnome-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
       - gnome-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
       - mediacheck:
           machine: 64bit
     opensuse-Leap15.5-KDE-Live-x86_64:
       - kde-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
       - kde-live:
-          machine: 64bit-2G
+          machine: 64bit-3G
       - kde-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
       - kde-live:
-          machine: uefi-2G
+          machine: uefi-3G
       - mediacheck:
           machine: 64bit
       - kde-live_installation
       - kde-live-wayland:
-          machine: 64bit_virtio-2G
+          machine: 64bit_virtio-3G
       - kde_live_upgrade_leap_42.3
       - kde_live_upgrade_leap_15.0:
           machine: 64bit
@@ -154,9 +154,10 @@ scenarios:
       - mediacheck:
           machine: 64bit
     opensuse-Leap15.5-XFCE-Live-x86_64:
-      - xfce-live
       - xfce-live:
-          machine: uefi-usb-2G
+          machine: 64bit-3G
+      - xfce-live:
+          machine: uefi-usb-4G
       - mediacheck
     opensuse-15.5-Container-Image-x86_64:
       - container_image_on_centos_host:
diff --git a/job_groups/opensuse_leap_15.6_images.yaml b/job_groups/opensuse_leap_15.6_images.yaml
index 08c8300e..2ef33849 100644
--- a/job_groups/opensuse_leap_15.6_images.yaml
+++ b/job_groups/opensuse_leap_15.6_images.yaml
@@ -108,29 +108,29 @@ scenarios:
           machine: 64bit_virtio
     opensuse-Leap15.6-GNOME-Live-x86_64:
       - gnome-live:
-          machine: uefi-2G
+          machine: uefi-3G
       - gnome-live:
-          machine: 64bit-2G
+          machine: 64bit-3G
       - gnome-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
       - gnome-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
       - mediacheck:
           machine: 64bit
     opensuse-Leap15.6-KDE-Live-x86_64:
       - kde-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
       - kde-live:
-          machine: 64bit-2G
+          machine: 64bit-3G
       - kde-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
       - kde-live:
-          machine: uefi-2G
+          machine: uefi-3G
       - mediacheck:
           machine: 64bit
       - kde-live_installation
       - kde-live-wayland:
-          machine: 64bit_virtio-2G
+          machine: 64bit_virtio-3G
       - kde_live_upgrade_leap_42.3
       - kde_live_upgrade_leap_15.0:
           machine: 64bit
@@ -154,9 +154,10 @@ scenarios:
       - mediacheck:
           machine: 64bit
     opensuse-Leap15.6-XFCE-Live-x86_64:
-      - xfce-live
       - xfce-live:
-          machine: uefi-usb-2G
+          machine: 64bit-3G
+      - xfce-live:
+          machine: uefi-usb-4G
       - mediacheck
     opensuse-15.6-Container-Image-x86_64:
       - container_image_on_centos_host:
diff --git a/job_groups/opensuse_tumbleweed.yaml b/job_groups/opensuse_tumbleweed.yaml
index 0378330e..ae9cb47c 100644
--- a/job_groups/opensuse_tumbleweed.yaml
+++ b/job_groups/opensuse_tumbleweed.yaml
@@ -996,13 +996,13 @@ scenarios:
           machine: uefi-3G
           priority: 48
       - kde-live:
-          machine: uefi-usb-2G
+          machine: uefi-usb-4G
           priority: 48
       - kde-live:
           machine: 64bit-3G
           priority: 48
       - kde-live:
-          machine: USBboot_64-2G
+          machine: USBboot_64-3G
           priority: 48
       - mediacheck:
           machine: 64bit
@@ -1169,10 +1169,9 @@ scenarios:
           machine: 64bit
     opensuse-Tumbleweed-XFCE-Live-x86_64:
       - xfce-live:
-          settings:
-            QEMURAM: '3072'
+          machine: 64bit-3G
       - xfce-live:
-          machine: uefi-usb
+          machine: uefi-usb-4G
           priority: 49
       - mediacheck:
           machine: 64bit