diff --git a/src/main/target/SKYSTARSF405WING/target.c b/src/main/target/SKYSTARSF405WING/target.c
index 19260ea4b2a..98f833aec7b 100644
--- a/src/main/target/SKYSTARSF405WING/target.c
+++ b/src/main/target/SKYSTARSF405WING/target.c
@@ -25,12 +25,12 @@
 #include "drivers/timer_def_stm32f4xx.h"
 
 timerHardware_t timerHardware[] = {
-    DEF_TIM(TIM1,  CH1,  PA8,  TIM_USE_OUTPUT_AUTO,   0, 1), // S1 D(2,1,6) UP256
-    DEF_TIM(TIM8,  CH4,  PC9,  TIM_USE_OUTPUT_AUTO,   0, 0), // S2 D(2,7,7) UP217
     DEF_TIM(TIM8,  CH3,  PC8,  TIM_USE_OUTPUT_AUTO,   0, 0), // S3 D(2,2,0) UP217
+    DEF_TIM(TIM8,  CH4,  PC9,  TIM_USE_OUTPUT_AUTO,   0, 0), // S2 D(2,7,7) UP217
+    DEF_TIM(TIM1,  CH1,  PA8,  TIM_USE_OUTPUT_AUTO,   0, 1), // S1 D(2,1,6) UP256
     DEF_TIM(TIM1,  CH3N, PB15, TIM_USE_OUTPUT_AUTO,   0, 0), // S4 D(2,6,0) UP256
 
-    DEF_TIM(TIM1,  CH3N, PB15, TIM_USE_OUTPUT_AUTO,   0, 0), // S5 D(2,6,0) UP256
+    DEF_TIM(TIM2,  CH3,  PB10, TIM_USE_OUTPUT_AUTO,   0, 0), // S5 D(2,6,0) UP256
     DEF_TIM(TIM2,  CH4,  PB11, TIM_USE_OUTPUT_AUTO,   0, 0), // S6 D(1,7,3) UP173
     DEF_TIM(TIM2,  CH2,  PB3,  TIM_USE_OUTPUT_AUTO,   0, 0), // S7 D(1,6,3) UP173
     DEF_TIM(TIM2,  CH1,  PA15, TIM_USE_OUTPUT_AUTO,   0, 0), // S8 D(1,5,3) UP173
diff --git a/src/main/target/SKYSTARSF405WING/target.h b/src/main/target/SKYSTARSF405WING/target.h
index 2c219712ad1..1eba71a1e4a 100644
--- a/src/main/target/SKYSTARSF405WING/target.h
+++ b/src/main/target/SKYSTARSF405WING/target.h
@@ -38,7 +38,7 @@
 #define SPI1_MOSI_PIN   	    PA7
 
 #define USE_IMU_ICM42605
-#define IMU_ICM42605_ALIGN      CW180_DEG
+#define IMU_ICM42605_ALIGN      CW270_DEG_FLIP
 #define ICM42605_SPI_BUS        BUS_SPI1
 #define ICM42605_CS_PIN         PC14
 
@@ -130,6 +130,7 @@
 #define USE_PINIOBOX
 #define PINIO1_PIN                  PA4
 #define PINIO2_PIN                  PB5
+#define PINIO1_FLAGS				PINIO_FLAGS_INVERTED
 
 // *************** LEDSTRIP ************************
 #define USE_LED_STRIP