diff --git a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
index aa44a109c2..4c89af18c5 100644
--- a/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
+++ b/firmware/config/boards/hellen/hellen121nissan/board_configuration.cpp
@@ -87,7 +87,7 @@ static void setupDefaultSensorInputs() {
 	engineConfiguration->triggerInputPins[2] = GPIO_UNASSIGNED;
 	// Direct hall-only cam input
 	engineConfiguration->camInputs[0] = GPIOA_6;
-	engineConfiguration->camInputs[1 * 2] = GPIOA_7;
+	engineConfiguration->camInputs[1 * CAMS_PER_BANK] = GPIOA_7;
 
 	engineConfiguration->tps1_1AdcChannel = EFI_ADC_4;
 	engineConfiguration->tps2_1AdcChannel = EFI_ADC_NONE;
diff --git a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
index 49c4ce1891..51d7a17083 100644
--- a/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
+++ b/firmware/config/boards/hellen/hellen121vag/board_configuration.cpp
@@ -182,6 +182,9 @@ void setBoardDefaultConfiguration(void) {
 	engineConfiguration->useOnlyRisingEdgeForTrigger = true;
 	setAlgorithm(LM_SPEED_DENSITY PASS_CONFIG_PARAMETER_SUFFIX);
 
+	strcpy(CONFIG(engineMake), ENGINE_MAKE_VAG);
+	strcpy(CONFIG(engineCode), "base");
+
 	engineConfiguration->specs.cylindersCount = 4;
 	engineConfiguration->specs.firingOrder = FO_1_3_4_2;
 
diff --git a/firmware/config/engines/vw.cpp b/firmware/config/engines/vw.cpp
index e8a562050f..7e888af25d 100644
--- a/firmware/config/engines/vw.cpp
+++ b/firmware/config/engines/vw.cpp
@@ -81,6 +81,9 @@ void setHellen121Vag_vr6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 void setHellen121Vag_v6_cyl(DECLARE_CONFIG_PARAMETER_SIGNATURE) {
 	engineConfiguration->specs.cylindersCount = 6;
 	engineConfiguration->specs.displacement = 2.7;
+
+	engineConfiguration->camInputs[1 * CAMS_PER_BANK] = GPIOA_7; // 87a
+
 	engineConfiguration->specs.firingOrder = FO_1_4_3_6_2_5;
 }