diff --git a/.github/workflows/hardware-ci.yaml.disable b/.github/workflows/hardware-ci.yaml
similarity index 73%
rename from .github/workflows/hardware-ci.yaml.disable
rename to .github/workflows/hardware-ci.yaml
index ce1d177e30..16cbbf1ee6 100644
--- a/.github/workflows/hardware-ci.yaml.disable
+++ b/.github/workflows/hardware-ci.yaml
@@ -8,26 +8,33 @@ jobs:
       # Let all builds finish even if one fails early
       fail-fast: false
       matrix:
-        build-target: [f407-discovery, proteus_f4]
-
         include:
+          # - build-target: f407-discovery
+          #   script: hardware_ci_f4_discovery
+          #   runs-on: hw-ci-f4-discovery
+          #   test-suite: com.rusefi.HwCiF4Discovery
+          #   folder: config/boards/f407-discovery
+          #   config-name: all
+          #   openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg
+          #   serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01
+
           - build-target: f407-discovery
             script: hardware_ci_f4_discovery
-            runs-on: hw-ci-f4-discovery
+            runs-on: hw-ci-f4-discovery-2
             test-suite: com.rusefi.HwCiF4Discovery
             folder: config/boards/f407-discovery
             config-name: all
-            openocd-script: ../.github/workflows/openocd_ci_f4_discovery.cfg
-            serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_2B003B000A51343033393930-if01
+            openocd-script: ../.github/workflows/openocd_ci_f4_discovery_2.cfg
+            serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_1E0032000851353238333131-if01
 
-          - build-target: proteus_f4
-            script: hardware_ci_proteus
-            runs-on: hw-ci-proteus
-            test-suite: com.rusefi.HwCiF4Proteus
-            folder: config/boards/proteus
-            config-name: proteus_f4
-            openocd-script: ../.github/workflows/openocd_ci_proteus.cfg
-            serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01
+          # - build-target: proteus_f4
+          #   script: hardware_ci_proteus
+          #   runs-on: hw-ci-proteus
+          #   test-suite: com.rusefi.HwCiF4Proteus
+          #   folder: config/boards/proteus
+          #   config-name: proteus_f4
+          #   openocd-script: ../.github/workflows/openocd_ci_proteus.cfg
+          #   serial-device: /dev/serial/by-id/usb-rusEFI_LLC_rusEFI_Engine_Management_ECU_41003D000451383037343335-if01
 
     runs-on: ${{matrix.runs-on}}
 
@@ -43,6 +50,7 @@ jobs:
         git submodule update --init --depth=1 firmware/ext/uzlib
         git submodule update --init --depth=1 firmware/controllers/lua/luaaa
         git submodule update --init --depth=1 firmware/controllers/can/wideband_firmware
+        git submodule update --init --depth=1 java_console/luaformatter
 
     - name: Identify Agent
       run: uname -a
@@ -99,6 +107,9 @@ jobs:
       working-directory: ./java_tools
       run: ./gradlew :autotest:shadowJar
 
+    - name: List serial services
+      run: ls /dev/serial/by-id/
+
     # This both compiles and runs HW CI tests
     - name: Run Hardware CI
       working-directory: ./java_console
diff --git a/.github/workflows/openocd_ci_f4_discovery.cfg b/.github/workflows/openocd_ci_f4_discovery.cfg
index 54f042df58..ed89ff05df 100644
--- a/.github/workflows/openocd_ci_f4_discovery.cfg
+++ b/.github/workflows/openocd_ci_f4_discovery.cfg
@@ -12,4 +12,4 @@ set CHIPNAME F4_DISCOVERY
 
 source [find target/stm32f4x.cfg]
 
-reset_config srst_only
+reset_config none separate
diff --git a/.github/workflows/openocd_ci_f4_discovery_2.cfg b/.github/workflows/openocd_ci_f4_discovery_2.cfg
new file mode 100644
index 0000000000..0ec26473dd
--- /dev/null
+++ b/.github/workflows/openocd_ci_f4_discovery_2.cfg
@@ -0,0 +1,15 @@
+# Openocd script for STM32F4 Discovery Hardware CI
+source [find interface/stlink.cfg]
+hla_serial 066BFF575450707267053549
+
+transport select hla_swd
+
+# increase working area to 128KB
+set WORKAREASIZE 0x20000
+
+# chip name
+set CHIPNAME F4_DISCOVERY
+
+source [find target/stm32f4x.cfg]
+
+reset_config none separate
diff --git a/.github/workflows/openocd_ci_proteus.cfg b/.github/workflows/openocd_ci_proteus.cfg
index f1e95883fe..fb8247e1ef 100644
--- a/.github/workflows/openocd_ci_proteus.cfg
+++ b/.github/workflows/openocd_ci_proteus.cfg
@@ -12,4 +12,4 @@ set CHIPNAME PROTEUS
 
 source [find target/stm32f4x.cfg]
 
-reset_config srst_only
+reset_config none separate
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index 16b127729f..24d3469cc2 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -580,7 +580,7 @@ static void setDefaultEngineConfiguration() {
 	setEgoSensor(ES_14Point7_Free);
 
 	engineConfiguration->globalFuelCorrection = 1;
-	engineConfiguration->adcVcc = 3.0;
+	engineConfiguration->adcVcc = 3.3f;
 
 	engineConfiguration->map.sensor.type = MT_MPX4250;
 
@@ -995,7 +995,7 @@ void resetConfigurationExt(engine_type_e engineType) {
 
 void validateConfiguration() {
 	if (engineConfiguration->adcVcc > 5.0f || engineConfiguration->adcVcc < 1.0f) {
-		engineConfiguration->adcVcc = 3.0f;
+		engineConfiguration->adcVcc = 3.3f;
 	}
 	if (engineConfiguration->instantRpmRange == 0) {
         // todo: extract constant in instant_rpm_calculator.h?