diff --git a/.github/workflows/gen-configs.yaml b/.github/workflows/gen-configs.yaml
index bf2bdd04d6..49c585bc04 100644
--- a/.github/workflows/gen-configs.yaml
+++ b/.github/workflows/gen-configs.yaml
@@ -30,6 +30,14 @@ jobs:
       working-directory: ./firmware/
       run: bash gen_config.sh
 
+    # We want to force these files to come from the default "all" config, not the last board generated by gen_config.sh
+    - name: Fix The Mess
+      working-directory: ./firmware/
+      run: |
+        git checkout -- ./controllers/generated/engine_configuration_generated_structures.h
+        git checkout -- ../java_console/models/src/main/java/com/rusefi/config/generated/Fields.java
+        bash ./gen_config_default.sh
+
     - name: Upload .ini files
       working-directory: ./firmware/tunerstudio/generated
       run: ../upload_ini.sh ${{ secrets.RUSEFI_ONLINE_FTP_USER }} ${{ secrets.RUSEFI_ONLINE_FTP_PASS }} ${{ secrets.RUSEFI_FTP_SERVER }}