diff --git a/.github/workflows/build-rusEFI-console.yaml b/.github/workflows/build-rusEFI-console.yaml
index 50be8247d0..c1ae914022 100644
--- a/.github/workflows/build-rusEFI-console.yaml
+++ b/.github/workflows/build-rusEFI-console.yaml
@@ -23,8 +23,8 @@ jobs:
         run: sudo apt-get install sshpass
 
       - name: Generate Java (Antlr)
-        working-directory: ./java_tools/configuration_definition
-        run: ant antlr
+        working-directory: ./android
+        run: ./gradlew :config_definition:generateGrammarSource
 
       - name: Print GCC version
         working-directory: .
diff --git a/.github/workflows/hardware-ci.yaml b/.github/workflows/hardware-ci.yaml
index 2db5dc3077..7a87657b3d 100644
--- a/.github/workflows/hardware-ci.yaml
+++ b/.github/workflows/hardware-ci.yaml
@@ -74,8 +74,8 @@ jobs:
       run: openocd -f "interface/stlink.cfg" -f "target/stm32f4x.cfg" -c init -c targets -c "reset halt" -c "flash erase_sector 0 0 11" -c "flash write_image "deliver/rusefi.bin" 0x08000000" -c "reset run" -c "shutdown"
 
     - name: Generate Java (Antlr)
-      working-directory: ./java_tools/configuration_definition
-      run: ant antlr
+      working-directory: ./android
+      run: ./gradlew :config_definition:generateGrammarSource
 
     # This both compiles and runs HW CI tests
     - name: Run Hardware CI
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 29a714d539..4f22998e94 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/build.xml b/java_tools/configuration_definition/build.xml
deleted file mode 100644
index d963b029f8..0000000000
--- a/java_tools/configuration_definition/build.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<project default="jar">
-
-    <property name="javac.source" value="1.8"/>
-    <property name="javac.target" value="1.8"/>
-    <property name="console_path" value="../../java_console"/>
-
-    <target name="clean">
-        <delete dir="build"/>
-    </target>
-
-    <target name="antlr">
-        <echo message="Invoking grammar generator..."/>
-        <java jar="lib/antlr-4.9.3-complete.jar" args="-o build/generated-src/antlr/main src/main/antlr/RusefiConfigGrammar.g4" fork="true" failonerror="true" />
-    </target>
-
-    <target name="compile" depends="antlr">
-<fail message="Unsupported Java version: ${ant.java.version}. 
-  Make sure that the Java version is 1.8 NOT greater see https://github.com/rusefi/rusefi/issues/3128">
-  <condition>
-    <not>
-      <or>
-        <equals arg1="${ant.java.version}" arg2="1.8"/>
-      </or>
-    </not>
-  </condition>
-</fail>
-
-        <mkdir dir="build/classes"/>
-        <javac
-                source="${javac.source}"
-                debug="true"
-                target="${javac.target}"
-                destdir="build/classes"
-                classpath="${console_path}/lib/jsr305-2.0.1.jar:lib/junit.jar:../../java_console/lib/annotations.jar:lib/snakeyaml.jar:lib/antlr-4.9.3-complete.jar">
-            <src path="src/main/java"/>
-            <src path="src/test/java"/>
-            <src path="build/generated-src/antlr/main"/>
-            <src path="${console_path}/autoupdate/src/main/java"/>
-            <src path="${console_path}/inifile/src/main/java"/>
-            <src path="${console_path}/logging/src/main/java"/>
-            <src path="${console_path}/logging-api/src/main/java"/>
-            <src path="${console_path}/models/src/main/java"/>
-            <src path="${console_path}/shared_io/src/main/java"/>
-            <src path="../enum_to_string/src/main/java"/>
-        </javac>
-
-        <junit fork="no"
-               maxmemory="512m"
-               printsummary="yes"
-               haltonfailure="yes">
-
-            <jvmarg value="-ea"/>
-            <jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
-            <formatter type="brief"/>
-            <classpath path="build/classes:lib/junit.jar:lib/annotations.jar:lib/snakeyaml.jar:lib/antlr-4.9.3-complete.jar"/>
-            <batchtest todir="build">
-                <fileset dir="src/main/java" includes="**/test/**/*Test.java"/>
-                <fileset dir="src/test/java" includes="**/*Test.java"/>
-                <fileset dir="../enum_to_string/src/main/java" includes="**/test/**/*Test.java"/>
-            </batchtest>
-        </junit>
-
-    </target>
-
-    <target name="jar" depends="compile">
-        <mkdir dir="build/jar"/>
-        <jar destfile="../ConfigDefinition.jar" basedir="build/classes">
-            <manifest>
-                <attribute name="Main-Class" value="com.rusefi.ConfigDefinition"/>
-            </manifest>
-            <zipfileset dir="build/classes" includes="**/*.class"/>
-            <zipfileset src="lib/snakeyaml.jar" includes="**/*.class"/>
-			<zipfileset src="lib/antlr-4.9.3-complete.jar" includes="**/*.class"/>
-        </jar>
-    </target>
-
-</project>
\ No newline at end of file