diff --git a/firmware/gen_config_common.sh b/firmware/gen_config_common.sh
index 18e2944c22..d531b15c7e 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_BOARD_NAME} \
- -jar ../java_tools/configuration_definition/build/libs/config_definition.jar"
+ -jar ../java_tools/configuration_definition/build/libs/config_definition-all.jar"
 
 COMMON_GEN_CONFIG="
  -readfile OUTPUTS_SECTION_FROM_FILE console/binary/generated/output_channels.ini \
diff --git a/firmware/gen_signature.sh b/firmware/gen_signature.sh
index 93ed695d8f..04220bd862 100755
--- a/firmware/gen_signature.sh
+++ b/firmware/gen_signature.sh
@@ -12,7 +12,7 @@ echo "Generating signature for ${SHORT_BOARD_NAME}"
 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 config_definition.jar" >> ${SIGNATURE_FILE_NAME}
+echo "! SIGNATURE_HASH is a built-in variable generated by config_definition-all.jar" >> ${SIGNATURE_FILE_NAME}
 
 # read the current git branch name
 branchname=`git branch --show-current`
diff --git a/java_tools/configuration_definition/build.gradle b/java_tools/configuration_definition/build.gradle
index 33fce3e6ea..00b862d6e4 100644
--- a/java_tools/configuration_definition/build.gradle
+++ b/java_tools/configuration_definition/build.gradle
@@ -17,11 +17,6 @@ dependencies {
 shadowJar {
     dependsOn(':enum_to_string:shadowJar')
     dependsOn(':config_definition_base:shadowJar')
-    /*
-     to exclude suffix '-all'
-     in resulting archive file name
-    */
-    archiveClassifier = ''
 
     manifest {
         attributes(