diff --git a/firmware/controllers/trigger/decoders/trigger_subaru.cpp b/firmware/controllers/trigger/decoders/trigger_subaru.cpp
index d3c1ff9c338..68abaa25d9f 100644
--- a/firmware/controllers/trigger/decoders/trigger_subaru.cpp
+++ b/firmware/controllers/trigger/decoders/trigger_subaru.cpp
@@ -20,10 +20,6 @@ static void initialize_one_of_36_2_2_2(TriggerWaveform *s, int firstCount, int s
 	float wide = 30 * 2;
 	float narrow = 10 * 2;
 
-	s->setTriggerSynchronizationGap(0.333f);
-	s->setSecondTriggerSynchronizationGap(1.0f);
-	s->setThirdTriggerSynchronizationGap(3.0f);
-
 	float base = 0;
 
 	for (int i = 0; i < firstCount; i++) {
@@ -56,10 +52,18 @@ static void initialize_one_of_36_2_2_2(TriggerWaveform *s, int firstCount, int s
  */
 void initialize36_2_2_2(TriggerWaveform *s) {
 	initialize_one_of_36_2_2_2(s, 12, 15, true);
+
+	s->setTriggerSynchronizationGap(0.333f);
+	s->setSecondTriggerSynchronizationGap(1.0f);
+	s->setThirdTriggerSynchronizationGap(3.0f);
 }
 
 void initializeSubaruEZ30(TriggerWaveform *s) {
 	initialize_one_of_36_2_2_2(s, 18, 9, true);
+
+	s->setTriggerSynchronizationGap3(/*gapIndex*/0, 0.25, 0.5);
+	s->setTriggerSynchronizationGap3(/*gapIndex*/1, 0.7, 1.5);
+	s->setTriggerSynchronizationGap3(/*gapIndex*/2, 2, 4);
 }
 
 static void initializeSubaru7_6(TriggerWaveform *s, bool withCrankWheel) {