diff --git a/firmware/config/engines/vw_b6.cpp b/firmware/config/engines/vw_b6.cpp
index 6d6d97774a..68268735a7 100644
--- a/firmware/config/engines/vw_b6.cpp
+++ b/firmware/config/engines/vw_b6.cpp
@@ -20,6 +20,14 @@ static void commonPassatB6() {
 	engineConfiguration->vvtMode[0] = VVT_BOSCH_QUICK_START;
 	engineConfiguration->map.sensor.type = MT_BOSCH_2_5;
 
+	engineConfiguration->specs.cylindersCount = 4;
+	engineConfiguration->specs.firingOrder = FO_1_3_4_2;
+
+	for (int i = 4; i < MAX_CYLINDER_COUNT;i++) {
+		engineConfiguration->injectionPins[i] = Gpio::Unassigned;
+		engineConfiguration->ignitionPins[i] = Gpio::Unassigned;
+	}
+
 	engineConfiguration->canNbcType = CAN_BUS_NBC_VAG;
 
 	// Injectors flow 1214 cc/min at 100 bar pressure
@@ -55,6 +63,12 @@ static void commonPassatB6() {
 	engineConfiguration->highPressureFuel.v2 = 4.5; /* volts */;
 	engineConfiguration->highPressureFuel.value2 = BAR2KPA(140);
 
+	engineConfiguration->lowPressureFuel.v1 = 0.5; /* volts */;
+	engineConfiguration->lowPressureFuel.value1 = PSI2KPA(0);
+	engineConfiguration->lowPressureFuel.v2 = 4.5; /* volts */;
+	// todo: what's the proper calibration of this Bosch sensor? is it really 200psi?
+	engineConfiguration->lowPressureFuel.value2 = PSI2KPA(200);
+
 	gppwm_channel *lowPressureFuelPumpControl = &engineConfiguration->gppwm[1];
 	strcpy(engineConfiguration->gpPwmNote[1], "LPFP");
 	lowPressureFuelPumpControl->pwmFrequency = 20;
@@ -106,12 +120,19 @@ static void commonPassatB6() {
 
 	engineConfiguration->useETBforIdleControl = true;
 	engineConfiguration->injectionMode = IM_SEQUENTIAL;
-	engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL;}
+	engineConfiguration->crankingInjectionMode = IM_SEQUENTIAL;
+}
 
+/**
+ * set engine_type 39
+ */
 void setProteusVwPassatB6() {
 #if HW_PROTEUS
 	commonPassatB6();
 
+	engineConfiguration->lowPressureFuel.hwChannel = PROTEUS_IN_ANALOG_VOLT_5;
+	engineConfiguration->highPressureFuel.hwChannel = PROTEUS_IN_ANALOG_VOLT_4;
+
 	gppwm_channel *coolantControl = &engineConfiguration->gppwm[0];
 	coolantControl->pin = PROTEUS_LS_5;
 
@@ -146,11 +167,6 @@ void setMreVwPassatB6() {
 
 	// "19 - AN volt 4"
 	engineConfiguration->lowPressureFuel.hwChannel = EFI_ADC_12;
-	engineConfiguration->lowPressureFuel.v1 = 0.5; /* volts */;
-	engineConfiguration->lowPressureFuel.value1 = PSI2KPA(0);
-	engineConfiguration->lowPressureFuel.v2 = 4.5; /* volts */;
-	// todo: what's the proper calibration of this Bosch sensor? is it really 200psi?
-	engineConfiguration->lowPressureFuel.value2 = PSI2KPA(200);
 
 	engineConfiguration->isSdCardEnabled = false;
 
diff --git a/firmware/tunerstudio/rusefi.input b/firmware/tunerstudio/rusefi.input
index 28f302fd70..4f7f22664c 100644
--- a/firmware/tunerstudio/rusefi.input
+++ b/firmware/tunerstudio/rusefi.input
@@ -1821,6 +1821,7 @@ cmd_set_engine_type_Frankenso_Miata_NA6_VAF			= "@@TS_IO_TEST_COMMAND_char@@\x00
 cmd_set_engine_type_Frankenso_Miata_NB2 			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_FRANKENSO_MAZDA_MIATA_2003_16_hex@@"
 
 cmd_set_engine_type_Proteus_M73   					= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_BMW_M73_16_hex@@"
+cmd_set_engine_type_PROTEUS_VW_B6 					= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_VW_B6_16_hex@@"
 cmd_set_engine_type_PROTEUS_HONDA_ELEMENT_2003      = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_HONDA_ELEMENT_2003_16_hex@@"
 cmd_set_engine_type_PROTEUS_HONDA_OBD2A             = "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_HONDA_OBD2A_16_hex@@"
 cmd_set_engine_type_PROTEUS_MIATA_NB2   			= "@@TS_IO_TEST_COMMAND_char@@\x00\x30@@engine_type_e_PROTEUS_MIATA_NB2_16_hex@@"
@@ -3727,6 +3728,7 @@ dialog = tcuControls, "Transmission Settings"
 		commandButton = "microRusEFI CAN Extender",		cmd_set_engine_type_MRE_SECONDARY_CAN@@if_show_microRusEFI_presets
 
 		commandButton = "Proteus M73 v12",     		cmd_set_engine_type_Proteus_M73@@if_show_Proteus_presets
+		commandButton = "Proteus GDI VAG B6 test",  cmd_set_engine_type_PROTEUS_VW_B6@@if_show_Proteus_presets
 		commandButton = "Proteus Miata TCU",		cmd_set_engine_type_Proteus_Miata_TCU@@if_show_Proteus_presets
 		commandButton = "Proteus Lua Demo",		    cmd_set_engine_type_PROTEUS_LUA_DEMO@@if_show_Proteus_presets
 		commandButton = "Proteus Miata NB2",		cmd_set_engine_type_PROTEUS_MIATA_NB2@@if_show_Proteus_presets