diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml
index 144a4e8fb7..f4d3dac514 100644
--- a/.github/workflows/gen-configs.yaml
+++ b/.github/workflows/gen-configs.yaml
@@ -75,7 +75,6 @@ jobs:
         git add *_generated.h
         # get the original ramdisk images back in order to not overwrite the default placeholder
         git checkout -- firmware/hw_layer/mass_storage/ramdisk_image.h firmware/hw_layer/mass_storage/ramdisk_image_compressed.h
-        git checkout -- java_tools/ConfigDefinition.jar
         git checkout -- java_tools/enum2string.jar
         git status
         OUT=$(git commit -am "Auto-generated configs and docs" 2>&1) || echo "commit failed, finding out why"
diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh
index f93916b299..4414834c1d 100755
--- a/firmware/gen_config_common.sh
+++ b/firmware/gen_config_common.sh
@@ -1,6 +1,6 @@
 
 COMMON_GEN_CONFIG_PREFIX=" -DSystemOut.name=logs/gen_config_${SHORT_BOARDNAME} \
- -jar ../java_tools/ConfigDefinition.jar"
+ -jar ../java_tools/configuration_definition/build/libs/config_definition.jar"
 
 COMMON_GEN_CONFIG="
  -readfile OUTPUTS_SECTION_FROM_FILE console/binary/generated/output_channels.ini \
diff --git a/firmware/gen_live_documentation.sh b/firmware/gen_live_documentation.sh
index 0f0c990ac7..f64274263a 100755
--- a/firmware/gen_live_documentation.sh
+++ b/firmware/gen_live_documentation.sh
@@ -3,7 +3,7 @@
 rm gen_live_documentation.log
 
 java -DSystemOut.name=logs/gen_live_documentation \
- -cp ../java_tools/ConfigDefinition.jar \
+ -cp ../java_tools/configuration_definition/build/libs/config_definition.jar \
  com.rusefi.ldmp.LiveDataProcessor integration/LiveData.yaml
 [ $? -eq 0 ] || { echo "ERROR generating"; exit 1; }
 
diff --git a/firmware/gen_signature.sh b/firmware/gen_signature.sh
index e0c166d137..9662b3cb9e 100755
--- a/firmware/gen_signature.sh
+++ b/firmware/gen_signature.sh
@@ -12,7 +12,7 @@ echo "Generating signature for ${SHORT_BOARDNAME}"
 date=`TZ=Europe/London date +"%Y.%m.%d"`
 echo "! Generated by gen_signature.sh" > ${SIGNATURE_FILE_NAME}
 
-echo "! SIGNATURE_HASH is a built-in variable generated by ConfigDefinition.jar" >> ${SIGNATURE_FILE_NAME}
+echo "! SIGNATURE_HASH is a built-in variable generated by config_definition.jar" >> ${SIGNATURE_FILE_NAME}
 
 # read the current git branch name
 branchname=`git branch --show-current`
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
deleted file mode 100644
index 4d6314fb04..0000000000
Binary files a/java_tools/ConfigDefinition.jar and /dev/null differ
diff --git a/java_tools/configuration_definition/build.gradle b/java_tools/configuration_definition/build.gradle
index e04e7bb7db..fafa5a65b0 100644
--- a/java_tools/configuration_definition/build.gradle
+++ b/java_tools/configuration_definition/build.gradle
@@ -19,10 +19,8 @@ shadowJar {
      to exclude suffix '-all'
      in resulting archive file name
     */
-    archiveBaseName = 'ConfigDefinition'
     archiveClassifier = ''
 
-    destinationDirectory = file( '$rootDir/../..' )
     manifest {
         attributes(
                 'Main-Class': 'com.rusefi.ConfigDefinition'