diff --git a/firmware/config/system/mcuconf.h b/firmware/config/system/mcuconf.h
index 71c487d2a9..711b98173c 100644
--- a/firmware/config/system/mcuconf.h
+++ b/firmware/config/system/mcuconf.h
@@ -30,7 +30,6 @@
 
 #define STM32F4xx_MCUCONF
 
-#include "chconf.h"
 #include "boards.h"
 #include "efifeatures.h"
 #include "rusefi_enums.h"
@@ -90,34 +89,34 @@
 #define STM32_ADC_ADC1_DMA_PRIORITY         2
 #define STM32_ADC_ADC2_DMA_PRIORITY         2
 #define STM32_ADC_ADC3_DMA_PRIORITY         2
-#define STM32_ADC_IRQ_PRIORITY              COMMON_IRQ_PRIORITY
-#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     COMMON_IRQ_PRIORITY
-#define STM32_ADC_ADC2_DMA_IRQ_PRIORITY     COMMON_IRQ_PRIORITY
-#define STM32_ADC_ADC3_DMA_IRQ_PRIORITY     COMMON_IRQ_PRIORITY
+#define STM32_ADC_IRQ_PRIORITY              6
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     6
+#define STM32_ADC_ADC2_DMA_IRQ_PRIORITY     6
+#define STM32_ADC_ADC3_DMA_IRQ_PRIORITY     6
 
 /*
  * CAN driver system settings.
  */
-#define STM32_CAN_CAN1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_CAN_CAN2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+#define STM32_CAN_CAN2_IRQ_PRIORITY         11
 
 /*
  * EXT driver system settings.
  */
-#define STM32_EXT_EXTI0_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI1_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI2_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI3_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI4_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI16_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI17_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI18_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI19_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI20_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI21_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
-#define STM32_EXT_EXTI22_IRQ_PRIORITY       COMMON_IRQ_PRIORITY
+#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       15
+#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI20_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI21_IRQ_PRIORITY       15
+#define STM32_EXT_EXTI22_IRQ_PRIORITY       15
 
 /*
  * GPT driver system settings.
@@ -134,18 +133,18 @@
 #define STM32_GPT_USE_TIM11                 FALSE
 #define STM32_GPT_USE_TIM12                 FALSE
 #define STM32_GPT_USE_TIM14                 FALSE
-#define STM32_GPT_TIM1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM3_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM4_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM5_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM6_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM7_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM8_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM9_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM11_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM12_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
-#define STM32_GPT_TIM14_IRQ_PRIORITY        COMMON_IRQ_PRIORITY
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM5_IRQ_PRIORITY         3
+#define STM32_GPT_TIM6_IRQ_PRIORITY         7
+#define STM32_GPT_TIM7_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+#define STM32_GPT_TIM9_IRQ_PRIORITY         7
+#define STM32_GPT_TIM11_IRQ_PRIORITY        7
+#define STM32_GPT_TIM12_IRQ_PRIORITY        7
+#define STM32_GPT_TIM14_IRQ_PRIORITY        7
 
 /*
  * I2C driver system settings.
@@ -157,12 +156,12 @@
 #define STM32_I2C_I2C2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
 #define STM32_I2C_I2C3_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
 #define STM32_I2C_I2C3_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
-#define STM32_I2C_I2C1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_I2C_I2C2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_I2C_I2C3_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_I2C_I2C1_DMA_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_I2C_I2C2_DMA_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_I2C_I2C3_DMA_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C3_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_I2C3_DMA_PRIORITY         3
 #define STM32_I2C_I2C1_DMA_ERROR_HOOK()     chSysHalt()
 #define STM32_I2C_I2C2_DMA_ERROR_HOOK()     chSysHalt()
 #define STM32_I2C_I2C3_DMA_ERROR_HOOK()     chSysHalt()
@@ -170,13 +169,13 @@
 /*
  * ICU driver system settings.
  */
-#define STM32_ICU_TIM1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_ICU_TIM2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_ICU_TIM3_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_ICU_TIM4_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_ICU_TIM5_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_ICU_TIM8_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_ICU_TIM9_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM5_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+#define STM32_ICU_TIM9_IRQ_PRIORITY         7
 
 /*
  * MAC driver system settings.
@@ -186,20 +185,20 @@
 #define STM32_MAC_BUFFERS_SIZE              1522
 #define STM32_MAC_PHY_TIMEOUT               100
 #define STM32_MAC_ETH1_CHANGE_PHY_STATE     TRUE
-#define STM32_MAC_ETH1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_MAC_ETH1_IRQ_PRIORITY         13
 #define STM32_MAC_IP_CHECKSUM_OFFLOAD       0
 
 /*
  * PWM driver system settings.
  */
 #define STM32_PWM_USE_ADVANCED              FALSE
-#define STM32_PWM_TIM1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_PWM_TIM2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_PWM_TIM3_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_PWM_TIM4_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_PWM_TIM5_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_PWM_TIM8_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_PWM_TIM9_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+#define STM32_PWM_TIM9_IRQ_PRIORITY         7
 
 /*
  * SERIAL driver system settings.
@@ -229,9 +228,9 @@
 #define STM32_SPI_SPI1_DMA_PRIORITY         1
 #define STM32_SPI_SPI2_DMA_PRIORITY         1
 #define STM32_SPI_SPI3_DMA_PRIORITY         1
-#define STM32_SPI_SPI1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_SPI_SPI2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_SPI_SPI3_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
 #define STM32_SPI_DMA_ERROR_HOOK(spip)      chDbgCheck(TRUE, "STM32_SPI_DMA_ERROR_HOOK")
 
 /*
@@ -249,10 +248,10 @@
 #define STM32_UART_USART3_TX_DMA_STREAM     STM32_DMA_STREAM_ID(1, 3)
 #define STM32_UART_USART6_RX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 2)
 #define STM32_UART_USART6_TX_DMA_STREAM     STM32_DMA_STREAM_ID(2, 7)
-#define STM32_UART_USART1_IRQ_PRIORITY      COMMON_IRQ_PRIORITY
-#define STM32_UART_USART2_IRQ_PRIORITY      COMMON_IRQ_PRIORITY
-#define STM32_UART_USART3_IRQ_PRIORITY      COMMON_IRQ_PRIORITY
-#define STM32_UART_USART6_IRQ_PRIORITY      COMMON_IRQ_PRIORITY
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART6_IRQ_PRIORITY      12
 #define STM32_UART_USART1_DMA_PRIORITY      0
 #define STM32_UART_USART2_DMA_PRIORITY      0
 #define STM32_UART_USART3_DMA_PRIORITY      0
@@ -264,8 +263,8 @@
  */
 #define STM32_USB_USE_OTG1                  TRUE
 #define STM32_USB_USE_OTG2                  FALSE
-#define STM32_USB_OTG1_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
-#define STM32_USB_OTG2_IRQ_PRIORITY         COMMON_IRQ_PRIORITY
+#define STM32_USB_OTG1_IRQ_PRIORITY         14
+#define STM32_USB_OTG2_IRQ_PRIORITY         14
 #define STM32_USB_OTG1_RX_FIFO_SIZE         512
 #define STM32_USB_OTG2_RX_FIFO_SIZE         1024
 #define STM32_USB_OTG_THREAD_PRIO           LOWPRIO