diff --git a/firmware/bundle.mk b/firmware/bundle.mk
index 7933f59213..fd098c7f22 100644
--- a/firmware/bundle.mk
+++ b/firmware/bundle.mk
@@ -44,9 +44,6 @@ ifneq ($(BUNDLE_SIMULATOR),no)
   SIMULATOR_OUT = ../simulator/build/rusefi_simulator.exe
 endif
 
-CONSOLE_OUT = ../java_console_binary/rusefi_console.jar
-AUTOUPDATE_OUT = ../java_console_binary/rusefi_autoupdate.jar
-
 UPDATE_CONSOLE_FOLDER_SOURCES = \
   $(CONSOLE_OUT) \
   $(AUTOUPDATE_OUT)
@@ -106,19 +103,6 @@ BUNDLE_FILES = \
   $(FOLDER_TARGETS) \
   $(CONSOLE_FOLDER_TARGETS)
 
-#
-# problem statement: 'make -j4' could easily attempt to run parallel gradle processes. gradle does not seem to like it
-# see notes at https://github.com/rusefi/rusefi/pull/6031
-#
-
-FLOCK = flock /tmp/java.lock
-
-$(CONSOLE_OUT):
-	cd ../java_tools && $(FLOCK) ./gradlew :ui:shadowJar
-
-$(AUTOUPDATE_OUT):
-	cd ../java_tools && $(FLOCK) ./gradlew :autoupdate:jar
-
 $(SIMULATOR_OUT):
 	$(MAKE) -C ../simulator -r SIMULATOR_DEBUG_LEVEL_OPT="-O2" OS="Windows_NT"
 
diff --git a/firmware/rusefi_config.mk b/firmware/rusefi_config.mk
index 39fb9e1072..ce1754e9e9 100644
--- a/firmware/rusefi_config.mk
+++ b/firmware/rusefi_config.mk
@@ -1,3 +1,5 @@
+include ../java_tools/java_tools.mk
+
 INI_FILE = $(META_OUTPUT_ROOT_FOLDER)tunerstudio/generated/rusefi_$(SHORT_BOARD_NAME).ini
 SIG_FILE = $(PROJECT_DIR)/tunerstudio/generated/signature_$(SHORT_BOARD_NAME).txt
 
diff --git a/java_tools/java_tools.mk b/java_tools/java_tools.mk
new file mode 100644
index 0000000000..603d31f21a
--- /dev/null
+++ b/java_tools/java_tools.mk
@@ -0,0 +1,35 @@
+JAVA_TOOLS = ../java_tools
+
+#
+# problem statement: 'make -j4' could easily attempt to run parallel gradle processes. gradle does not seem to like it
+# see notes at https://github.com/rusefi/rusefi/pull/6031
+#
+FLOCK = flock /tmp/java.lock
+
+CONFIG_DEFINITION = $(JAVA_TOOLS)/configuration_definition/build/libs/config_definition-all.jar
+CONFIG_DEFINITION_BASE = $(JAVA_TOOLS)/configuration_definition_base/build/libs/config_definition_base-all.jar
+ENUM_TO_STRING = $(JAVA_TOOLS)/enum_to_string/build/libs/enum_to_string-all.jar
+CONSOLE_OUT = ../java_console_binary/rusefi_console.jar
+AUTOUPDATE_OUT = ../java_console_binary/rusefi_autoupdate.jar
+TPL_OUT = ../java_tools/ts_plugin_launcher/build/jar/rusefi_ts_plugin_launcher.jar
+
+$(CONFIG_DEFINITION): .FORCE
+	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :config_definition:shadowJar
+
+$(CONFIG_DEFINITION_BASE): .FORCE
+	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :config_definition_base:shadowJar
+
+$(ENUM_TO_STRING): .FORCE
+	cd $(JAVA_TOOLS) && $(FLOCK) ./gradlew :enum_to_string:shadowJar
+
+$(TPL_OUT): .FORCE
+	cd ../java_tools && $(FLOCK) ./gradlew :ts_plugin_launcher:shadowJar
+
+$(CONSOLE_OUT): .FORCE
+	cd ../java_tools && $(FLOCK) ./gradlew :ui:shadowJar
+
+$(AUTOUPDATE_OUT): .FORCE
+	cd ../java_tools && $(FLOCK) ./gradlew :autoupdate:jar
+
+.FORCE:
+