diff --git a/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh b/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh
index 9093c02f0c..33ae24fed7 100755
--- a/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh
+++ b/firmware/config/boards/cypress/config/hellen_cypress_gen_enum_to_string.sh
@@ -5,7 +5,7 @@
 cd ../../../../..
 
 java -DSystemOut.name=logs/gen_enum_to_string_hellen_cypress \
- -jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
+ -jar ../java_tools/enum_to_string/build/libs/enum_to_string-all.jar \
  -outputPath config/boards/сypress/config/controllers/algo \
  -enumInputFile config/boards/cypress/rusefi_hw_enums.h
 
diff --git a/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh b/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
index 5d7cd94a84..430539b169 100755
--- a/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
+++ b/firmware/config/boards/kinetis/config/kinetis_gen_enum_to_string.sh
@@ -3,7 +3,7 @@
 cd ../../../..
 
 java -DSystemOut.name=logs/gen_enum_to_string_kinetis \
- -jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
+ -jar ../java_tools/enum_to_string/build/libs/enum_to_string-all.jar \
  -outputPath config/boards/kinetis/config/controllers/algo \
  -enumInputFile config/boards/kinetis/rusefi_hw_enums.h
 
diff --git a/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh b/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
index e135aadeb4..34918da36d 100755
--- a/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
+++ b/firmware/config/boards/subaru_eg33/config/gen_enum_to_string.sh
@@ -8,7 +8,7 @@ echo This batch files reads rusefi_enums.h and produces auto_generated_enums.* f
 BOARD=subaru_eg33
 
 java -DSystemOut.name=logs/gen_enum_to_string \
-    -jar ../java_tools/enum_to_string/build/libs/enum_to_string.jar \
+    -jar ../java_tools/enum_to_string/build/libs/enum_to_string-all.jar \
     -inputPath . \
     -outputPath config/boards/${BOARD}/config/controllers/algo \
     -enumInputFile config/boards/${BOARD}/rusefi_hw_enums.h
diff --git a/firmware/gen_enum_to_string.sh b/firmware/gen_enum_to_string.sh
index 345998fabf..f8e6d3755b 100755
--- a/firmware/gen_enum_to_string.sh
+++ b/firmware/gen_enum_to_string.sh
@@ -9,7 +9,7 @@ cd ../firmware
 
 rm gen_enum_to_string.log
 
-ENUM_JAR=../java_tools/enum_to_string/build/libs/enum_to_string.jar
+ENUM_JAR=../java_tools/enum_to_string/build/libs/enum_to_string-all.jar
 
 java -DSystemOut.name=logs/gen_java_enum -cp ${ENUM_JAR} com.rusefi.ToJavaEnum -enumInputFile controllers/sensors/sensor_type.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
 [ $? -eq 0 ] || { echo "ERROR generating sensors"; exit 1; }
diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh
index a36a1e2bdf..21f5bf05dc 100755
--- a/firmware/gen_live_documentation.sh
+++ b/firmware/gen_live_documentation.sh
@@ -8,13 +8,13 @@ cd ../java_tools
 cd ../firmware
 
 java -DSystemOut.name=logs/gen_live_documentation \
- -cp ../java_tools/configuration_definition_base/build/libs/config_definition_base.jar \
+ -cp ../java_tools/configuration_definition_base/build/libs/config_definition_base-all.jar \
  com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
 [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
 
-java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum_to_string/build/libs/enum_to_string.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
+java -DSystemOut.name=logs/gen_java_enum -cp ../java_tools/enum_to_string/build/libs/enum_to_string-all.jar com.rusefi.ToJavaEnum -enumInputFile console/binary/generated/live_data_ids.h -outputPath ../java_console/io/src/main/java/com/rusefi/enums
 [ $? -eq 0 ] || { echo "ERROR generating live data ids"; exit 1; }
 
 # live_data_ids.h is generated above so order of operations is important here!
 
-./gen_enum_to_string.sh
\ No newline at end of file
+./gen_enum_to_string.sh
diff --git a/java_tools/configuration_definition_base/build.gradle b/java_tools/configuration_definition_base/build.gradle
index 948f097626..803d1836d7 100644
--- a/java_tools/configuration_definition_base/build.gradle
+++ b/java_tools/configuration_definition_base/build.gradle
@@ -17,5 +17,4 @@ dependencies {
 
 shadowJar {
     dependsOn(':enum_to_string:shadowJar')
-    archiveClassifier = ''
 }
diff --git a/java_tools/enum_to_string/build.gradle b/java_tools/enum_to_string/build.gradle
index da2b3bf210..956491cbef 100644
--- a/java_tools/enum_to_string/build.gradle
+++ b/java_tools/enum_to_string/build.gradle
@@ -10,12 +10,6 @@ dependencies {
 }
 
 shadowJar {
-    /*
-     to exclude suffix '-all'
-     in resulting archive file name
-    */
-    archiveClassifier = ''
-
     manifest {
         attributes(
                 'Main-Class': 'com.rusefi.EnumToString'