diff --git a/dasharo-compatibility/ec-and-super-IO.robot b/dasharo-compatibility/ec-and-super-IO.robot
index 8b7dd40f5e..0d34e5180d 100644
--- a/dasharo-compatibility/ec-and-super-IO.robot
+++ b/dasharo-compatibility/ec-and-super-IO.robot
@@ -1,5 +1,6 @@
 *** Settings ***
 Library             Collections
+Library             Dialogs
 Library             OperatingSystem
 Library             Process
 Library             String
diff --git a/dasharo-compatibility/usb-type-c-semiauto.robot b/dasharo-compatibility/usb-type-c-semiauto.robot
index f041eceb96..4fc044669e 100644
--- a/dasharo-compatibility/usb-type-c-semiauto.robot
+++ b/dasharo-compatibility/usb-type-c-semiauto.robot
@@ -1,5 +1,6 @@
 *** Settings ***
 Library             Collections
+Library             Dialogs
 Library             OperatingSystem
 Library             Process
 Library             String
diff --git a/util/basic-platform-setup.robot b/util/basic-platform-setup.robot
index b7e1ed8935..a1d0fcb87b 100644
--- a/util/basic-platform-setup.robot
+++ b/util/basic-platform-setup.robot
@@ -1,16 +1,14 @@
 *** Settings ***
 Library             Collections
+Library             Dialogs
 Library             OperatingSystem
 Library             Process
 Library             String
 Library             Telnet    timeout=30 seconds    connection_timeout=120 seconds
 Library             SSHLibrary    timeout=90 seconds
 Library             RequestsLibrary
-# Library    ../osfv-scripts/osfv_cli/src/osfv/rf/rte_robot.py
 # TODO: maybe have a single file to include if we need to include the same
 # stuff in all test cases
-Resource            ../sonoff-rest-api/sonoff-api.robot
-Resource            ../rtectrl-rest-api/rtectrl.robot
 Resource            ../variables.robot
 Resource            ../keywords.robot
 Resource            ../keys.robot
@@ -26,6 +24,11 @@ Suite Teardown      Run Keyword
 ...                     Log Out And Close Connection
 
 
+*** Variables ***
+# Assume Dasharo as a default firmware, can be overwritten by CMD parameter.
+${FIRMWARE}=    dasharo
+
+
 *** Test Cases ***
 BPS001.001 Power Control - Power On and Serial output
     [Documentation]    Verifies if the DUT can be turned On and if the serial output can be read.
@@ -126,18 +129,41 @@ BPS003.002 Sonoff Power Off
     ${result}=    Wait For Serial Output    timeout=10
     Should Not Be True    ${result}    msg=Failed power off DUT via Sonoff
 
-BPS004.001 Boot to OS - Ubuntu
-    [Documentation]    This test verifies if platform can be booted to Ubunto and if correct credentials are set.
+BPS004.001 Boot to OS - Dasharo, Ubuntu
+    [Documentation]    This test verifies if platform with Dasharo firmware can
+    ...    be booted to Ubunto and if correct credentials are set.
+    Skip If    '${FIRMWARE}' != 'dasharo'
     Power On
     Boot System Or From Connected Disk    ubuntu
     Login To Linux
     Switch To Root User
 
-BPS004.002 Boot to OS - Windows
-    [Documentation]    This test verifies if platform can be booted to Windows, if SSH server is enabled and if correct credentials are set.
+BPS004.002 Boot to OS - Dasharo, Windows
+    [Documentation]    This test verifies if platform with Dasharo firmware can
+    ...    be booted to Windows, if SSH server is enabled and if correct
+    ...    credentials are set.
+    Skip If    '${FIRMWARE}' != 'dasharo' and '${FIRMWARE}' != ''
     Power On
     Login To Windows
 
+BPS004.003 Boot to OS - AMI, Ubuntu
+    [Documentation]    This test verifies if platform with AMI firmware can
+    ...    be booted to Ubuntu and if correct credentials are set.
+    Skip If    '${FIRMWARE}' != 'ami'
+    Power On
+    Execute Manual Step    Boot to Ubuntu
+    Login To Linux
+    Switch To Root User
+
+BPS004.004 Boot to OS - AMI, Windows
+    [Documentation]    This test verifies if platform with AMI firmware can be
+    ...    booted to Windows, if SSH server is enabled and if correct
+    ...    credentials are set.
+    Skip If    '${FIRMWARE}' != 'ami'
+    Power On
+    Execute Manual Step    Boot to Windows
+    Login To Windows Via SSH
+
 BPS005.001 External flashing
     [Documentation]    This test verifies if the flash die can be detected.
     ${rc}=    Rte Flash Probe