diff --git a/src/main/target/YUPIF4/target.c b/src/main/target/YUPIF4/target.c
index 74a21fdb61..16f17c726d 100644
--- a/src/main/target/YUPIF4/target.c
+++ b/src/main/target/YUPIF4/target.c
@@ -20,15 +20,17 @@
 #include <platform.h>
 #include "drivers/io.h"
 #include "drivers/timer.h"
+#include "drivers/timer_def.h"
 #include "drivers/dma.h"
 
+
 const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
-    { TIM8, IO_TAG(PC8), TIM_Channel_3, TIM_USE_PPM,   0, GPIO_AF_TIM8, NULL, 0, 0 }, // PPM IN
-    { TIM2, IO_TAG(PA0), TIM_Channel_1, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, NULL, 0, 0 }, // MS1
-    { TIM2, IO_TAG(PA1), TIM_Channel_2, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, NULL, 0, 0 }, // MS2
-    { TIM2, IO_TAG(PA2), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, NULL, 0, 0 }, // MS3
-    { TIM2, IO_TAG(PA3), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM2, NULL, 0, 0 }, // MS4
-    { TIM3, IO_TAG(PB0), TIM_Channel_3, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, NULL, 0, 0 }, // MS5
-    { TIM3, IO_TAG(PB1), TIM_Channel_4, TIM_USE_MOTOR, 1, GPIO_AF_TIM3, DMA1_Stream2, DMA_Channel_5, DMA1_ST2_HANDLER }, // MS6
+    DEF_TIM(TIM8, CH2, PC7, TIM_USE_PPM,                 TIMER_INPUT_ENABLED,  0 ), // PPM IN
+    DEF_TIM(TIM5, CH1, PA0, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED, 0 ), // S1_OUT - DMA1_ST2
+    DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED, 0 ), // S2_OUT - DMA1_ST4
+    DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED, 0 ), // S3_OUT - DMA1_ST1
+    DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED, 1 ), // S4_OUT - DMA1_ST6
+    DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR | TIM_USE_LED, TIMER_OUTPUT_ENABLED, 0 ), // S5_OUT - DMA1_ST7
+    DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR,               TIMER_OUTPUT_ENABLED, 0 ), // S6_OUT - DMA1_ST2
 };
 
diff --git a/src/main/target/YUPIF4/target.h b/src/main/target/YUPIF4/target.h
index b25ea293c7..1a38664fc7 100644
--- a/src/main/target/YUPIF4/target.h
+++ b/src/main/target/YUPIF4/target.h
@@ -109,11 +109,11 @@
 // SPI Ports
 #define USE_SPI
 
-#define USE_SPI_DEVICE_1 //MPU6500
+#define USE_SPI_DEVICE_1 //Gyro
 #define SPI1_NSS_PIN            PA4
 #define SPI1_SCK_PIN            PA5
 #define SPI1_MISO_PIN           PA6
-#define SPI1_MOSI_PIN             PA7
+#define SPI1_MOSI_PIN           PA7
 
 /*
 #define USE_SPI_DEVICE_2 //Free
@@ -138,7 +138,7 @@
 #define VBAT_ADC_PIN            PC1
 #define RSSI_ADC_GPIO_PIN       PC0
 
-
+#define USE_DSHOT
 #define LED_STRIP
 
 // Default configuration
@@ -156,4 +156,4 @@
 #define TARGET_IO_PORTD         (BIT(2))
 
 #define USABLE_TIMER_CHANNEL_COUNT 7
-#define USED_TIMERS             (TIM_N(2) | TIM_N(3) | TIM_N(8))
+#define USED_TIMERS             (TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8))