diff --git a/firmware/config/engines/lada_kalina.cpp b/firmware/config/engines/lada_kalina.cpp
index 44152f5f0d..268d1a4094 100644
--- a/firmware/config/engines/lada_kalina.cpp
+++ b/firmware/config/engines/lada_kalina.cpp
@@ -28,6 +28,7 @@ void setLadaKalina(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->useStepperIdle = true;
 	engineConfiguration->useHbridges = true;
 	engineConfiguration->idleMode = IM_AUTO;
+	engineConfiguration->useTLE8888_stepper = true;
 }
 
 #else
diff --git a/firmware/hw_layer/drivers/gpio/tle8888.c b/firmware/hw_layer/drivers/gpio/tle8888.c
index 3de9fa3621..54ea8c31a3 100644
--- a/firmware/hw_layer/drivers/gpio/tle8888.c
+++ b/firmware/hw_layer/drivers/gpio/tle8888.c
@@ -1130,9 +1130,10 @@ static int tle8888_chip_init_data(void * data) {
 		}
 	}
 
-	/* HACK HERE if you want to enable PP for OUT21..OUT24
-	 * without approprirate call to setPinMode */
-	//chip->o_pp_mask		|= BIT(20) | BIT(21) | BIT(22) | BIT(23);
+	/* Enable Push-Pull mode for OUT21..OUT24 */
+	if (cfg->stepper) {
+		chip->o_pp_mask	|= BIT(20) | BIT(21) | BIT(22) | BIT(23);
+	}
 
 	/* enable all direct driven */
 	chip->o_oe_mask		|= chip->o_direct_mask;
diff --git a/firmware/hw_layer/drivers/gpio/tle8888.h b/firmware/hw_layer/drivers/gpio/tle8888.h
index f449eace11..411e54ea2f 100644
--- a/firmware/hw_layer/drivers/gpio/tle8888.h
+++ b/firmware/hw_layer/drivers/gpio/tle8888.h
@@ -65,6 +65,9 @@ struct tle8888_config {
 		uint_fast8_t	pad;
 	} inj_en;
 	tle8888_mode_e mode;
+	/* this is workaround to enable PP mode for OUT21..OUT24
+	 * until users won't call setPinMode */
+	bool			stepper;
 };
 
 #ifdef __cplusplus
diff --git a/firmware/hw_layer/smart_gpio.cpp b/firmware/hw_layer/smart_gpio.cpp
index f34ed5a9c5..ead3204341 100644
--- a/firmware/hw_layer/smart_gpio.cpp
+++ b/firmware/hw_layer/smart_gpio.cpp
@@ -149,6 +149,7 @@ struct tle8888_config tle8888_cfg = {
 	.ign_en =  {.port = GPIOD,	.pad = 10},
 	.inj_en =  {.port = GPIOD,	.pad = 11},
 	.mode = TL_AUTO,
+	.stepper = false
 };
 #endif
 
@@ -220,6 +221,7 @@ void initSmartGpio() {
 		tle8888_cfg.spi_bus = getSpiDevice(engineConfiguration->tle8888spiDevice);
 
 		tle8888_cfg.mode = engineConfiguration->tle8888mode;
+		tle8888_cfg.stepper = engineConfiguration->useTLE8888_stepper;
 
 		/* spi_bus == null checked in _add function */
 		ret = tle8888_add(0, &tle8888_cfg);