diff --git a/RESULTS.md b/RESULTS.md
index c9e53ad8..976be77e 100644
--- a/RESULTS.md
+++ b/RESULTS.md
@@ -16,47 +16,74 @@ Product test commands
 ---
 
 rocky-boot-iso-x86_64-*
-```
-sudo openqa-cli api -X POST isos \
+```sh
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-boot.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
-  FLAVOR=boot-iso \
   ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=boot-iso \
+  VERSION=8.4 \
   BUILD="-boot-iso-$(date +%Y%m%d.%H%M%S).0"
 ```
 
 rocky-minimal-iso-x86_64-*
-```
-sudo openqa-cli api -X POST isos \
+```sh
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-minimal.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
-  FLAVOR=minimal-iso \
   ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=minimal-iso \
+  VERSION=8.4 \
   BUILD="-minimal-iso-$(date +%Y%m%d.%H%M%S).0"
 ```
 
 rocky-dvd-iso-x86_64-*
-```
-sudo openqa-cli api -X POST isos \
+```sh
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-dvd1.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
+  ARCH=x86_64 DISTRI=rocky \
   FLAVOR=dvd-iso \
+  PACKAGE_SET=minimal \
+  VERSION=8.4 \
+  BUILD="-minimal-$(date +%Y%m%d.%H%M%S).0"
+
+openqa-cli api -X POST isos \
+  ISO=Rocky-8.4-x86_64-dvd1.iso \
   ARCH=x86_64 \
-  BUILD="-dvd-iso-$(date +%Y%m%d.%H%M%S).0"
+  DISTRI=rocky \
+  FLAVOR=dvd-iso \
+  PACKAGE_SET=server \
+  VERSION=8.4 \
+  BUILD="-server-$(date +%Y%m%d.%H%M%S).0"
+
+openqa-cli api -X POST isos \
+  ISO=Rocky-8.4-x86_64-dvd1.iso \
+  ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=dvd-iso \
+  PACKAGE_SET=graphical-server \
+  DESKTOP=gnome \
+  VERSION=8.4 \
+  BUILD="-graphical-server-$(date +%Y%m%d.%H%M%S).0"
+
+openqa-cli api -X POST isos \
+  ISO=Rocky-8.4-x86_64-dvd1.iso \
+  ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=dvd-iso \
+  PACKAGE_SET=workstation \
+  DESKTOP=gnome \
+  VERSION=8.4 \
+  BUILD="-workstation-$(date +%Y%m%d.%H%M%S).0"
 ```
 
 rocky-universal-x86_64-*
-```
-sudo openqa-cli api -X POST isos \
+```sh
+openqa-cli api -X POST isos \
   ISO=Rocky-8.4-x86_64-dvd1.iso \
-  DISTRI=rocky \
-  VERSION=8.4 \
-  FLAVOR=universal \
   ARCH=x86_64 \
+  DISTRI=rocky \
+  FLAVOR=universal \
+  VERSION=8.4 \
   BUILD="-universal-$(date +%Y%m%d.%H%M%S).0"
 ```
-
-
diff --git a/templates.fif.json b/templates.fif.json
index 6d9489dd..d3083e84 100644
--- a/templates.fif.json
+++ b/templates.fif.json
@@ -562,6 +562,7 @@
                 "rocky-dvd-iso-x86_64-*-uefi": 31
             },
             "settings": {
+                "HDDSIZEGB": "15",
                 "PARTITIONING": "custom_standard_partition_ext4",
                 "ROOT_PASSWORD": "weakpassword"
             }
diff --git a/tests/_graphical_wait_login.pm b/tests/_graphical_wait_login.pm
index 3d126f7b..ef45a8da 100644
--- a/tests/_graphical_wait_login.pm
+++ b/tests/_graphical_wait_login.pm
@@ -39,18 +39,20 @@ sub run {
     # install, which transitions straight from g-i-s to logged-in
     # desktop
     unless (get_var("DESKTOP") eq 'gnome' && get_var("INSTALL_NO_USER")) {
-        # for Rocky Linux here happens to be a license acceptance screen
-        # the initial appearance can sometimes take really long
-        assert_screen "gdm_initial_setup_license", 120;
-        assert_and_click "gdm_initial_setup_license";
-        # Make sure the card has fully lifted until clicking on the buttons
-        wait_still_screen 5, 30;
-        assert_and_click "gdm_initial_setup_licence_accept";
-        assert_and_click "gdm_spoke_done";
-        # As well as coming back
-        wait_still_screen 5, 30;
-        assert_screen "gdm_initial_setup_license_accepted";
-        assert_and_click "gdm_initial_setup_spoke_forward";
+        unless (get_var("HDD_1") && !(get_var("PARTITIONING") eq "custom_resize_lvm")) {
+            # for Rocky Linux here happens to be a license acceptance screen
+            # the initial appearance can sometimes take really long
+            assert_screen "gdm_initial_setup_license", 120;
+            assert_and_click "gdm_initial_setup_license";
+            # Make sure the card has fully lifted until clicking on the buttons
+            wait_still_screen 5, 30;
+            assert_and_click "gdm_initial_setup_licence_accept";
+            assert_and_click "gdm_spoke_done";
+            # As well as coming back
+            wait_still_screen 5, 30;
+            assert_screen "gdm_initial_setup_license_accepted";
+            assert_and_click "gdm_initial_setup_spoke_forward";
+        }
 
         boot_to_login_screen(timeout => $wait_time);
         # if USER_LOGIN is set to string 'false', we're done here
diff --git a/tests/disk_custom_lvm_ext4_postinstall.pm b/tests/disk_custom_lvm_ext4_postinstall.pm
index 8f66a443..d72c18a4 100644
--- a/tests/disk_custom_lvm_ext4_postinstall.pm
+++ b/tests/disk_custom_lvm_ext4_postinstall.pm
@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     my $devboot = 'vda1';
 
diff --git a/tests/disk_custom_lvmthin_postinstall.pm b/tests/disk_custom_lvmthin_postinstall.pm
index 1f2d4c25..0d941739 100644
--- a/tests/disk_custom_lvmthin_postinstall.pm
+++ b/tests/disk_custom_lvmthin_postinstall.pm
@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     # check that lvmthinpool is present:
     # http://atodorov.org/blog/2015/04/14/how-to-find-if-lvm-volume-is-thinly-provisioned/
diff --git a/tests/disk_custom_software_raid_postinstall.pm b/tests/disk_custom_software_raid_postinstall.pm
index 6cff869e..ad3d53d1 100644
--- a/tests/disk_custom_software_raid_postinstall.pm
+++ b/tests/disk_custom_software_raid_postinstall.pm
@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     # check that RAID is used
     assert_script_run "cat /proc/mdstat | grep 'Personalities : \\\[raid1\\\]'";
diff --git a/tests/disk_custom_standard_partition_ext4_postinstall.pm b/tests/disk_custom_standard_partition_ext4_postinstall.pm
index 429eabdb..a80d3858 100644
--- a/tests/disk_custom_standard_partition_ext4_postinstall.pm
+++ b/tests/disk_custom_standard_partition_ext4_postinstall.pm
@@ -1,8 +1,13 @@
 use base "installedtest";
 use strict;
 use testapi;
+use utils;
 
 sub run {
+    my $self = shift;
+    unless (check_screen "root_console", 0) {
+        $self->root_console(tty=>4);
+    }
     assert_screen "root_console";
     my $count = 4;
     my $devroot = 'vda1';