diff --git a/firmware/config/boards/hellen/cypress/config/gen_config.sh b/firmware/config/boards/hellen/cypress/config/gen_config.sh
index d8f00a082c..2af32da21d 100644
--- a/firmware/config/boards/hellen/cypress/config/gen_config.sh
+++ b/firmware/config/boards/hellen/cypress/config/gen_config.sh
@@ -14,15 +14,16 @@ pwd
 
 bash gen_signature.sh hellen_cypress
 
+source gen_config_common.sh
+echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
+
 java \
  -DSystemOut.name=gen_config_hellen_cypress \
- -jar ../java_tools/ConfigDefinition.jar \
- -definition integration/rusefi_config.txt \
+ $COMMON_GEN_CONFIG \
  -cache hellen_cypress \
  -cache_zip_file tunerstudio/generated/cache.zip \
  -ts_destination tunerstudio \
  -tool hellen_cypress_gen_config.bat \
- -firing_order controllers/algo/firing_order.h \
  -with_c_defines false \
  -initialize_to_zero false \
  -ts_output_name generated/rusefi_hellen_cypress.ini \
@@ -30,7 +31,6 @@ java \
  -c_destination config/boards/hellen/cypress/config/controllers/algo/engine_configuration_generated_structures.h \
  -signature tunerstudio/generated/signature_hellen_cypress.txt \
  -signature_destination controllers/generated/signature_hellen_cypress.h \
- -enumInputFile controllers/algo/rusefi_enums.h \
  -enumInputFile controllers/algo/rusefi_hw_enums.h \
  -board hellen_cypress \
  -prepend config/boards/hellen/cypress/config/tunerstudio/generated/hellen_cypress_prefix.txt
diff --git a/firmware/config/boards/kinetis/config/gen_config.sh b/firmware/config/boards/kinetis/config/gen_config.sh
index be4ccd8d8e..4c56f544dd 100644
--- a/firmware/config/boards/kinetis/config/gen_config.sh
+++ b/firmware/config/boards/kinetis/config/gen_config.sh
@@ -14,15 +14,16 @@ pwd
 
 bash gen_signature.sh kin
 
+source gen_config_common.sh
+echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
+
 java \
  -DSystemOut.name=gen_config_kinetis \
- -jar ../java_tools/ConfigDefinition.jar \
- -definition integration/rusefi_config.txt \
+ $COMMON_GEN_CONFIG \
  -cache kinetis \
  -cache_zip_file tunerstudio/generated/cache.zip \
  -ts_destination tunerstudio \
  -tool kinetis_gen_config.bat \
- -firing_order controllers/algo/firing_order.h \
  -with_c_defines false \
  -initialize_to_zero false \
  -ts_output_name generated/rusefi_kinetis.ini \
@@ -30,7 +31,6 @@ java \
  -c_destination config/boards/kinetis/config/controllers/algo/engine_configuration_generated_structures.h \
  -signature tunerstudio/generated/signature_kin.txt \
  -signature_destination controllers/generated/signature_kin.h \
- -enumInputFile controllers/algo/rusefi_enums.h \
  -enumInputFile controllers/algo/rusefi_hw_enums.h \
  -board kinetis \
  -prepend config/boards/kinetis/config/rusefi_config_kinetis.txt
diff --git a/firmware/config/boards/subaru_eg33/config/gen_config.sh b/firmware/config/boards/subaru_eg33/config/gen_config.sh
index d6eb7d1a0e..64fcb890e1 100755
--- a/firmware/config/boards/subaru_eg33/config/gen_config.sh
+++ b/firmware/config/boards/subaru_eg33/config/gen_config.sh
@@ -6,17 +6,24 @@ BOARDNAME=subaru_eg33
 SHORT_BOARDNAME=${BOARDNAME}_f7
 BOARD_DIR=config/boards/${BOARDNAME}
 
+
+
+
+
+
+
 bash gen_signature.sh ${SHORT_BOARDNAME}
 
+source gen_config_common.sh
+echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
+
 java \
  -DSystemOut.name=gen_config_subaru_eg33 \
- -jar ../java_tools/ConfigDefinition.jar \
- -definition integration/rusefi_config.txt \
+ $COMMON_GEN_CONFIG \
  -cache ${SHORT_BOARDNAME} \
  -cache_zip_file tunerstudio/generated/cache.zip \
  -ts_destination tunerstudio \
  -tool ${BOARD_DIR}/config/gen_config.sh \
- -firing_order controllers/algo/firing_order.h \
  -with_c_defines false \
  -initialize_to_zero false \
  -ts_output_name generated/rusefi_${SHORT_BOARDNAME}.ini \
@@ -24,7 +31,6 @@ java \
  -c_destination ${BOARD_DIR}/config/controllers/algo/engine_configuration_generated_structures.h \
  -signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
  -signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
- -enumInputFile controllers/algo/rusefi_enums.h \
  -enumInputFile ${BOARD_DIR}/rusefi_hw_enums.h \
  -board ${BOARDNAME} \
  -prepend config/boards/${BOARDNAME}/prepend.txt
diff --git a/firmware/gen_config_board.sh b/firmware/gen_config_board.sh
index df50630277..aa5197fe19 100755
--- a/firmware/gen_config_board.sh
+++ b/firmware/gen_config_board.sh
@@ -42,10 +42,12 @@ if [ "" = "$BOARD_SPECIFIC_URL" ]; then
 fi
 echo "BOARD_SPECIFIC_URL=[$BOARD_SPECIFIC_URL]"
 
+source gen_config_common.sh
+echo "Using COMMON_GEN_CONFIG [$COMMON_GEN_CONFIG]"
+
 # work in progress: migrating to rusefi_${BUNDLE_NAME}.txt
 java -DSystemOut.name=gen_config_board \
-	-jar ../java_tools/ConfigDefinition.jar \
-	-definition integration/rusefi_config.txt \
+ $COMMON_GEN_CONFIG \
   -romraider integration \
 	-tool gen_config.sh \
 	-ts_destination tunerstudio \
@@ -55,11 +57,9 @@ java -DSystemOut.name=gen_config_board \
 	-cache_zip_file tunerstudio/generated/cache.zip \
   -with_c_defines $SOMETHINGSOMETHING \
   -initialize_to_zero $SOMETHINGSOMETHING \
-	-firing_order controllers/algo/firing_order.h \
 	-signature tunerstudio/generated/signature_${SHORT_BOARDNAME}.txt \
 	-signature_destination controllers/generated/signature_${SHORT_BOARDNAME}.h \
   -java_destination ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java \
-	-enumInputFile controllers/algo/rusefi_enums.h \
 	-enumInputFile controllers/algo/rusefi_hw_enums.h \
   -romraider_destination ../java_console/rusefi.xml \
   -c_defines        controllers/generated/rusefi_generated.h \
diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh
new file mode 100644
index 0000000000..f1f89566d8
--- /dev/null
+++ b/firmware/gen_config_common.sh
@@ -0,0 +1,4 @@
+COMMON_GEN_CONFIG="-jar ../java_tools/ConfigDefinition.jar \
+ -enumInputFile controllers/algo/rusefi_enums.h \
+ -firing_order controllers/algo/firing_order.h \
+ -definition integration/rusefi_config.txt"