diff --git a/firmware/config/boards/subaru_eg33/board.mk b/firmware/config/boards/subaru_eg33/board.mk
index e8e31447cd..a36549434b 100644
--- a/firmware/config/boards/subaru_eg33/board.mk
+++ b/firmware/config/boards/subaru_eg33/board.mk
@@ -23,7 +23,12 @@ DDEFS += -DHW_SUBARU_EG33=1
 DDEFS += -DDEFAULT_ENGINE_TYPE=SUBARUEG33_DEFAULTS
 
 #Some options override
+#ICU vs PAL/EXTI
 DDEFS += -DHAL_TRIGGER_USE_PAL=TRUE
+DDEFS += -DEFI_ICU_INPUTS=FALSE
+DDEFS += -DEFI_LOGIC_ANALYZER=FALSE
+DDEFS += -DHAL_VSS_USE_PAL=TRUE
+
 DDEFS += -DHAL_USE_UART=FALSE
 DDEFS += -DUART_USE_WAIT=FALSE
 
diff --git a/firmware/config/boards/subaru_eg33/board_io.h b/firmware/config/boards/subaru_eg33/board_io.h
index 27961a9274..5235ee28fc 100644
--- a/firmware/config/boards/subaru_eg33/board_io.h
+++ b/firmware/config/boards/subaru_eg33/board_io.h
@@ -201,7 +201,7 @@
 							 DEFAULT_GPIO_SPEED( 3)	| \
 							 DEFAULT_GPIO_SPEED( 4)	| \
 							 DEFAULT_GPIO_SPEED( 5)	| \
-							 DEFAULT_GPIO_SPEED( 6)	| \
+							 PIN_OSPEED_HIGH( 6)	| \
 							 DEFAULT_GPIO_SPEED( 7)	| \
 							 DEFAULT_GPIO_SPEED( 8)	| \
 							 DEFAULT_GPIO_SPEED( 9)	| \
@@ -241,7 +241,7 @@
 							 PIN_AFIO_AF( 3,  0U)	| \
 							 PIN_AFIO_AF( 4,  0U)	| \
 							 PIN_AFIO_AF( 5,  0U)	| \
-							 PIN_AFIO_AF( 6,  0U)	| \
+							 PIN_AFIO_AF( 6, 10U)	| \
 							 PIN_AFIO_AF( 7,  0U))
 #define VAL_GPIOB_AFRH		(PIN_AFIO_AF( 8,  0U)	| \
 							 PIN_AFIO_AF( 9,  0U)	| \
@@ -376,7 +376,7 @@
  * PD10 - Power hold to PMIC
  * PD11 - QSPI IO0
  * PD12 - QSPI IO1
- * PD13 - QSPI IO2
+ * PD13 - QSPI IO3
  * PD14 - Speed sensor input
  * PD15 - LIN RTS
  */
@@ -488,7 +488,7 @@
  */
 #define VAL_GPIOE_MODER     (PIN_MODE_ALTERNATE(0)	| \
 							 PIN_MODE_ALTERNATE(1)	| \
-							 PIN_MODE_OUTPUT(2) /* PIN_MODE_ALTERNATE(2) */	| \
+							 PIN_MODE_ALTERNATE(2)	| \
 							 PIN_MODE_OUTPUT(3)		| \
 							 PIN_MODE_OUTPUT(4)		| \
 							 PIN_MODE_OUTPUT(5)		| \
@@ -520,7 +520,7 @@
 							 PIN_OTYPE_OPENDRAIN(15))
 #define VAL_GPIOE_OSPEEDR	(DEFAULT_GPIO_SPEED( 0)	| \
 							 DEFAULT_GPIO_SPEED( 1)	| \
-							 DEFAULT_GPIO_SPEED( 2)	| \
+							 PIN_OSPEED_HIGH( 2)	| \
 							 DEFAULT_GPIO_SPEED( 3)	| \
 							 DEFAULT_GPIO_SPEED( 4)	| \
 							 DEFAULT_GPIO_SPEED( 5)	| \