diff --git a/dasharo-performance/CPT_CPF_STB/201_ubuntu.robot b/dasharo-performance/CPT_CPF_STB/201_ubuntu.robot
index 6444b3cff7..5c0558a3ae 100644
--- a/dasharo-performance/CPT_CPF_STB/201_ubuntu.robot
+++ b/dasharo-performance/CPT_CPF_STB/201_ubuntu.robot
@@ -17,6 +17,7 @@ Suite Setup     Run Keywords
 #    Tests that can be done immediately    #
 ############################################
 _CONCURRENT_Background Measurements Immediate (no load) (Ubuntu)
+    [Tags]    minimal-regression
     # immediately skip if no tests want these measurements
     ${will_any_be_run}=    Check Concurrent Test Supported Regex
     ...    (CPF001)|(STB002).201
@@ -84,6 +85,7 @@ STB002.201 Verify if no unexpected boot errors appear in Linux logs
     [Documentation]    This test aims to verify that there are no unexpected
     ...    error ,essages in Linux kernel logs.
     ...    Previous IDs: STB002.001
+    [Tags]    minimal-regression
     VAR    ${concurrent_test_id}=    STB001.201
     Skip If Concurrent Test Not Supported    ${concurrent_test_id}
     ${outs}=    Get Concurrent Test Outputs    ${concurrent_test_id}
diff --git a/lib/flash.robot b/lib/flash.robot
index d3feff89b8..8893eff9bf 100644
--- a/lib/flash.robot
+++ b/lib/flash.robot
@@ -173,11 +173,11 @@ Read Firmware
     [Arguments]    ${file}
 
     IF    '${FLASHING_METHOD}' == 'external'
-        IF    '${MANUFACTURER}' == 'PC Engines' and '${APU_FLASH_WP_GPIO}' != '${TBD}'
+        IF    '${APU_FLASH_WP_GPIO}' != '${TBD}'
             Rte Gpio Set    ${APU_FLASH_WP_GPIO}    low
         END
         Rte Flash Read    ${file}
-        IF    '${MANUFACTURER}' == 'PC Engines' and '${APU_FLASH_WP_GPIO}' != '${TBD}'
+        IF    '${APU_FLASH_WP_GPIO}' != '${TBD}'
             Rte Gpio Set    ${APU_FLASH_WP_GPIO}    high-z
         END
     ELSE IF    '${FLASHING_METHOD}' == 'internal'
diff --git a/platform-configs/include/pcengines.robot b/platform-configs/include/pcengines.robot
index 46fb6fd4c1..1fafcf4dfa 100644
--- a/platform-configs/include/pcengines.robot
+++ b/platform-configs/include/pcengines.robot
@@ -39,6 +39,7 @@ ${DMIDECODE_FAMILY}=                        N/A
 # TODO
 ${DMIDECODE_TYPE}=                          Desktop
 ${INTERNAL_PROGRAMMER_CHIPNAME}=            W25Q64BV/W25Q64CV/W25Q64FV
+${DEVICE_USB_KEYBOARD}=                     ${EMPTY}
 
 # Supported test environments
 ${TESTS_IN_FIRMWARE_SUPPORT}=               ${TRUE}
@@ -80,6 +81,7 @@ ${ESP_SCANNING_SUPPORT}=                    ${TRUE}
 ${DTS_FIRMWARE_FLASHING_SUPPORT}=           ${TRUE}
 ${MINI_PC_IE_SLOT_SUPPORT}=                 ${TRUE}
 ${APU_CONFIGURATION_MENU_SUPPORT}=          ${TRUE}
+${DUT_HAS_CMOS_RESET}=                      ${FALSE}
 
 # Test module: dasharo-security
 ${TPM_SUPPORTED_VERSION}=                   2
diff --git a/platform-configs/pcengines-apu2.robot b/platform-configs/pcengines-apu2.robot
index a3c5fae4bc..daaae1c24b 100644
--- a/platform-configs/pcengines-apu2.robot
+++ b/platform-configs/pcengines-apu2.robot
@@ -4,12 +4,13 @@ Resource    include/pcengines.robot
 
 *** Variables ***
 ${DMIDECODE_PRODUCT_NAME}=          apu2
-${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1-rc3
+${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1
 ${FLASH_VERIFY_METHOD}=             none
 ${PLATFORM_CPU_SPEED}=              1.0
 ${PLATFORM_RAM_SPEED}=              1333
 ${PLATFORM_RAM_SIZE}=               4096
 ${BIOS_LOCK_SUPPORT}=               ${True}
+${APU_FLASH_WP_GPIO}=               1
 
 # DTS E2E variables
 
diff --git a/platform-configs/pcengines-apu3.robot b/platform-configs/pcengines-apu3.robot
index ae31f2b602..12fb30df1e 100644
--- a/platform-configs/pcengines-apu3.robot
+++ b/platform-configs/pcengines-apu3.robot
@@ -4,7 +4,8 @@ Resource    include/pcengines.robot
 
 *** Variables ***
 ${DMIDECODE_PRODUCT_NAME}=          apu3
-${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1-rc3
+${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1
 ${FLASH_VERIFY_METHOD}=             none
+${APU_FLASH_WP_GPIO}=               1
 
 # DTS E2E variables
diff --git a/platform-configs/pcengines-apu4.robot b/platform-configs/pcengines-apu4.robot
index a82a719bd2..e5bebbeffb 100644
--- a/platform-configs/pcengines-apu4.robot
+++ b/platform-configs/pcengines-apu4.robot
@@ -4,7 +4,8 @@ Resource    include/pcengines.robot
 
 *** Variables ***
 ${DMIDECODE_PRODUCT_NAME}=          apu4
-${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1-rc3
+${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1
 ${FLASH_VERIFY_METHOD}=             none
+${APU_FLASH_WP_GPIO}=               1
 
 # DTS E2E variables
diff --git a/platform-configs/pcengines-apu6.robot b/platform-configs/pcengines-apu6.robot
index 211e711478..1b2cc0ffe2 100644
--- a/platform-configs/pcengines-apu6.robot
+++ b/platform-configs/pcengines-apu6.robot
@@ -4,7 +4,7 @@ Resource    include/pcengines.robot
 
 *** Variables ***
 ${DMIDECODE_PRODUCT_NAME}=          apu6
-${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1-rc3
+${DMIDECODE_FIRMWARE_VERSION}=      Dasharo (coreboot+UEFI) v0.9.1
 ${FLASH_VERIFY_METHOD}=             none
 ${APU_FLASH_WP_GPIO}=               1
 
diff --git a/util/basic-platform-setup.robot b/util/basic-platform-setup.robot
index a99cecd42a..e753aa6cf1 100644
--- a/util/basic-platform-setup.robot
+++ b/util/basic-platform-setup.robot
@@ -99,7 +99,7 @@ BPS005.001 Boot to OS - Ubuntu
 
 BPS005.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.
-    Skip If    not "${TESTS_IN_WINDOWS_SUPPORT}"
+    Skip If    not ${TESTS_IN_WINDOWS_SUPPORT}    ${TEST_NAME} not supported
     Power On
     Login To Windows
 
@@ -111,7 +111,13 @@ BPS006.001 Ensure test dependencies
 BPS007.001 External flashing
     [Documentation]    This test verifies if the flash die can be detected.
     Skip If    '${FLASHING_METHOD}' != 'external'
+    IF    '${APU_FLASH_WP_GPIO}' != '${TBD}'
+        Rte Gpio Set    ${APU_FLASH_WP_GPIO}    low
+    END
     ${rc}=    Rte Flash Probe
+    IF    '${APU_FLASH_WP_GPIO}' != '${TBD}'
+        Rte Gpio Set    ${APU_FLASH_WP_GPIO}    high-z
+    END
     Should Be Equal As Integers    ${rc}    0
 
 BPS007.002 Internal flashing