diff --git a/firmware/config/engines/mazda_miata_1_6.cpp b/firmware/config/engines/mazda_miata_1_6.cpp
index 60eeacf4f2..23fca6a92a 100644
--- a/firmware/config/engines/mazda_miata_1_6.cpp
+++ b/firmware/config/engines/mazda_miata_1_6.cpp
@@ -115,7 +115,7 @@ void miataNAcommon(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	engineConfiguration->ignitionMode = IM_WASTED_SPARK;
 }
 
-void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+void setMiataNA6_MAP_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	setCustomEngineConfiguration(PASS_ENGINE_PARAMETER_SIGNATURE);
 
 	// Frankenso analog #6 pin 3R, W56 (5th lower row pin from the end) top <> W45 bottom jumper, not OEM
@@ -209,6 +209,11 @@ void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
 	engineConfiguration->injectionMode = IM_BATCH;
 
 	miataNAcommon(PASS_ENGINE_PARAMETER_SIGNATURE);
-	// todo: MAF-based ignition table?
 	copyFuelTable(miataNA6_maf_fuel_table, config->fuelTable);
 }
+
+void setMiataNA6_VAF_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE) {
+	setMiataNA6_MAP_Configuration(PASS_ENGINE_PARAMETER_SIGNATURE);
+	engineConfiguration->fuelAlgorithm = LM_PLAIN_MAF;
+	// todo: MAF-based ignition table?
+}
diff --git a/firmware/config/engines/mazda_miata_1_6.h b/firmware/config/engines/mazda_miata_1_6.h
index 6edf0c1fef..d842da7165 100644
--- a/firmware/config/engines/mazda_miata_1_6.h
+++ b/firmware/config/engines/mazda_miata_1_6.h
@@ -9,7 +9,8 @@
 #define CONFIG_ENGINES_MAZDA_MIATA_1_6_H_
 
 #include "engine.h"
-void setMiataNA_1_6_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+void setMiataNA6_VAF_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE);
+void setMiataNA6_MAP_Configuration(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 void miataNAcommon(DECLARE_ENGINE_PARAMETER_SIGNATURE);
 
 #endif /* CONFIG_ENGINES_MAZDA_MIATA_1_6_H_ */
diff --git a/firmware/controllers/algo/auto_generated_enums.cpp b/firmware/controllers/algo/auto_generated_enums.cpp
index b21f78d23c..19c3331e4e 100644
--- a/firmware/controllers/algo/auto_generated_enums.cpp
+++ b/firmware/controllers/algo/auto_generated_enums.cpp
@@ -87,8 +87,10 @@ case MIATA_1994_SPAGS:
   return "MIATA_1994_SPAGS";
 case MIATA_1996:
   return "MIATA_1996";
-case MIATA_NA_1_6:
-  return "MIATA_NA_1_6";
+case MIATA_NA6_MAP:
+  return "MIATA_NA6_MAP";
+case MIATA_NA6_VAF:
+  return "MIATA_NA6_VAF";
 case MINI_COOPER_R50:
   return "MINI_COOPER_R50";
 case MITSU_4G93:
diff --git a/firmware/controllers/algo/engine_configuration.cpp b/firmware/controllers/algo/engine_configuration.cpp
index d822bbd22d..9f59dd6e91 100644
--- a/firmware/controllers/algo/engine_configuration.cpp
+++ b/firmware/controllers/algo/engine_configuration.cpp
@@ -1152,8 +1152,11 @@ void resetConfigurationExt(Logging * logger, engine_type_e engineType DECLARE_EN
 	case ZIL_130:
 		setZil130(PASS_ENGINE_PARAMETER_SIGNATURE);
 		break;
-	case MIATA_NA_1_6:
-		setMiataNA_1_6_Configuration(PASS_ENGINE_PARAMETER_SIGNATURE);
+	case MIATA_NA6_MAP:
+		setMiataNA6_MAP_Configuration(PASS_ENGINE_PARAMETER_SIGNATURE);
+		break;
+	case MIATA_NA6_VAF:
+		setMiataNA6_VAF_Configuration(PASS_ENGINE_PARAMETER_SIGNATURE);
 		break;
 	case MAZDA_MIATA_NA8:
 		setMazdaMiataNA8Configuration(PASS_ENGINE_PARAMETER_SIGNATURE);
diff --git a/firmware/controllers/algo/rusefi_enums.h b/firmware/controllers/algo/rusefi_enums.h
index 1b2dd771ba..2e70b7ef13 100644
--- a/firmware/controllers/algo/rusefi_enums.h
+++ b/firmware/controllers/algo/rusefi_enums.h
@@ -130,7 +130,7 @@ typedef enum {
 	GEO_STORM = 40,
 
 	// Frankenso board
-	MIATA_NA_1_6 = 41,
+	MIATA_NA6_MAP = 41,
 
 	ZIL_130 = 42,
 
@@ -175,6 +175,9 @@ typedef enum {
 
 	MAZDA_MIATA_NA8 = 56,
 
+	// see also	MIATA_NA6_MAP = 41
+	MIATA_NA6_VAF = 57,
+
 	PROMETHEUS_DEFAULTS = 100,
 
 	Force_4_bytes_size_engine_type = ENUM_32_BITS,