diff --git a/needles/cockpit/rocky-basic-cockpit_login-20230115.json b/needles/cockpit/rocky-basic-cockpit_login-20230115.json
new file mode 100644
index 00000000..a9126e9c
--- /dev/null
+++ b/needles/cockpit/rocky-basic-cockpit_login-20230115.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "height": 77,
+      "width": 232,
+      "type": "match",
+      "ypos": 221,
+      "xpos": 515
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_login"
+  ]
+}
diff --git a/needles/cockpit/rocky-basic-cockpit_login-20230115.png b/needles/cockpit/rocky-basic-cockpit_login-20230115.png
new file mode 100644
index 00000000..d4f1dcbd
Binary files /dev/null and b/needles/cockpit/rocky-basic-cockpit_login-20230115.png differ
diff --git a/needles/cockpit/rocky-cockpit_login-20230115.json b/needles/cockpit/rocky-cockpit_login-20230115.json
new file mode 100644
index 00000000..d4aeb2d9
--- /dev/null
+++ b/needles/cockpit/rocky-cockpit_login-20230115.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "ypos": 200,
+      "height": 77,
+      "type": "match",
+      "width": 232,
+      "xpos": 515
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_login"
+  ]
+}
diff --git a/needles/cockpit/rocky-cockpit_login-20230115.png b/needles/cockpit/rocky-cockpit_login-20230115.png
new file mode 100644
index 00000000..4f1be371
Binary files /dev/null and b/needles/cockpit/rocky-cockpit_login-20230115.png differ
diff --git a/needles/cockpit/rocky-server_cockpit_basic-cockpit_services_entry-20230114.json b/needles/cockpit/rocky-server_cockpit_basic-cockpit_services_entry-20230114.json
new file mode 100644
index 00000000..1eacf403
--- /dev/null
+++ b/needles/cockpit/rocky-server_cockpit_basic-cockpit_services_entry-20230114.json
@@ -0,0 +1,16 @@
+{
+  "area": [
+    {
+      "xpos": 328,
+      "ypos": 366,
+      "width": 59,
+      "height": 25,
+      "type": "match"
+    }
+  ],
+  "properties": [],
+  "tags": [
+    "ENV-DISTRI-rocky",
+    "cockpit_services_entry"
+  ]
+}
\ No newline at end of file
diff --git a/needles/cockpit/rocky-server_cockpit_basic-cockpit_services_entry-20230114.png b/needles/cockpit/rocky-server_cockpit_basic-cockpit_services_entry-20230114.png
new file mode 100644
index 00000000..8eee9882
Binary files /dev/null and b/needles/cockpit/rocky-server_cockpit_basic-cockpit_services_entry-20230114.png differ
diff --git a/tests/_console_wait_login.pm b/tests/_console_wait_login.pm
index b885249e..68306219 100644
--- a/tests/_console_wait_login.pm
+++ b/tests/_console_wait_login.pm
@@ -23,6 +23,9 @@ sub run {
     # Wait for the text login
     boot_to_login_screen(timeout => $wait_time);
 
+    # switch to TTY3 for both, graphical and console tests
+    $self->root_console(tty=>3);
+
     # do user login unless USER_LOGIN is set to string 'false'
     unless (get_var("USER_LOGIN") eq "false") {
         # this avoids us waiting 90 seconds for a # to show up
diff --git a/tests/_setup_browser.pm b/tests/_setup_browser.pm
index 9fdef5ed..69782462 100644
--- a/tests/_setup_browser.pm
+++ b/tests/_setup_browser.pm
@@ -5,6 +5,9 @@ use utils;
 
 sub run {
     my $self = shift;
+    # switch to TTY3 for both, graphical and console tests
+    $self->root_console(tty=>3);
+
     # set up appropriate repositories
     repo_setup();
     # use --enablerepo=fedora for Modular compose testing (we need to
diff --git a/tests/os_release.pm b/tests/os_release.pm
index 7bfac861..de25ce4f 100644
--- a/tests/os_release.pm
+++ b/tests/os_release.pm
@@ -43,7 +43,7 @@ sub run {
         my $ver_major = substr($version_id, 0, index($version_id, q/./));
         my $ver_minor = substr($version_id, index($version_id, q/./), length($version_id));
         my $target = lc($ver_major);
-        if ( $ver_major = '9' ) {
+        if ( $ver_major == '9' || '8' ) {
             $target = lc($version_id);
         }
 
@@ -82,7 +82,7 @@ sub run {
 
         # Test for Rocky Support Product
         $strip = strip_marks($content{'ROCKY_SUPPORT_PRODUCT'});
-        if ( $ver_major = '9' ) {
+        if ( $ver_major == '9' || '8' ) {
             $fullname = qq/$fullname $ver_major/;
             $fullname =~ s/ /-/g;
         }
diff --git a/tests/server_filesystem_default.pm b/tests/server_filesystem_default.pm
index dd8eb170..5b2ccc0d 100644
--- a/tests/server_filesystem_default.pm
+++ b/tests/server_filesystem_default.pm
@@ -5,6 +5,9 @@ use utils;
 
 sub run {
     my $self = shift;
+    # switch to TTY3 for both, graphical and console tests
+    $self->root_console(tty=>3);
+
     # check / is xfs, as it should be on server
     assert_script_run 'findmnt -M / -o FSTYPE | grep xfs';
 }