diff --git a/firmware/Makefile b/firmware/Makefile
index c7726dfa37..9614c8b9d0 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -62,7 +62,7 @@ endif
 
 # C++ specific options here (added to USE_OPT).
 ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -std=c++17 -Wno-register -fno-rtti -fno-threadsafe-statics -fno-exceptions -fno-use-cxa-atexit
+  USE_CPPOPT = -std=c++2a -Wno-register -fno-rtti -fno-threadsafe-statics -fno-exceptions -fno-use-cxa-atexit
 endif
 
 # Hellen is one of the boards which cares
diff --git a/firmware/bootloader/src/Makefile b/firmware/bootloader/src/Makefile
index 7a44726a86..c3e227546c 100644
--- a/firmware/bootloader/src/Makefile
+++ b/firmware/bootloader/src/Makefile
@@ -39,7 +39,7 @@ endif
 # C++ specific options here (added to USE_OPT).
 ifeq ($(USE_CPPOPT),)
   # constexpr float expf_taylor_impl probably needs just c++14 but why not go with 17?
-  USE_CPPOPT = -std=c++17 -Wno-register -fno-rtti -fno-exceptions -fno-use-cxa-atexit -Werror=write-strings -Werror=type-limits -Winvalid-pch
+  USE_CPPOPT = -std=c++2a -Wno-register -fno-rtti -fno-exceptions -fno-use-cxa-atexit -Werror=write-strings -Werror=type-limits -Winvalid-pch
 endif
 
 # Enable this if you want the linker to remove unused code and data
diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 49e6490471..c7608d0d55 100644
Binary files a/java_tools/ConfigDefinition.jar and b/java_tools/ConfigDefinition.jar differ
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/BitGroupLayout.java b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/BitGroupLayout.java
index 23638b98a3..4c569f674d 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/BitGroupLayout.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/newparse/layout/BitGroupLayout.java
@@ -84,11 +84,11 @@ public class BitGroupLayout extends Layout {
                 }
 
                 ps.println("offset " + this.offsetWithinStruct + " bit " + i + " */");
-                ps.println("\tbool " + bit.name + " : 1;");
+                ps.println("\tbool " + bit.name + " : 1 {};");
             } else {
                 // Force pad out all bit groups to a full 32b/4B
                 ps.println("offset " + this.offsetWithinStruct + " bit " + i + " */");
-                ps.println("\tbool unusedBit_" + this.offsetWithinStruct + "_" + i + " : 1;");
+                ps.println("\tbool unusedBit_" + this.offsetWithinStruct + "_" + i + " : 1 {};");
             }
         }
     }
diff --git a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java
index 4316c8038b..545d749a91 100644
--- a/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java
+++ b/java_tools/configuration_definition/src/main/java/com/rusefi/output/BaseCHeaderConsumer.java
@@ -11,7 +11,7 @@ public abstract class BaseCHeaderConsumer implements ConfigurationConsumer {
     public static String getHeaderText(ConfigField configField, int currentOffset, int bitIndex) {
         if (configField.isBit()) {
             String comment = "\t/**" + EOL + ConfigDefinition.packComment(configField.getCommentContent(), "\t") + "\toffset " + currentOffset + " bit " + bitIndex + " */" + EOL;
-            return comment + "\t" + BOOLEAN_TYPE + " " + configField.getName() + " : 1;" + EOL;
+            return comment + "\t" + BOOLEAN_TYPE + " " + configField.getName() + " : 1 {};" + EOL;
         }
 
         String cEntry = ConfigDefinition.getComment(configField.getCommentContent(), currentOffset, configField.getUnits());
diff --git a/simulator/Makefile b/simulator/Makefile
index e20fcc7c4e..1eefece3f8 100644
--- a/simulator/Makefile
+++ b/simulator/Makefile
@@ -65,7 +65,7 @@ endif
 
 # C++ specific options here (added to USE_OPT).
 ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -std=c++17 -Wno-register -fno-rtti
+  USE_CPPOPT = -std=c++2a -Wno-register -fno-rtti
 endif
 
 # Enable this if you want the linker to remove unused code and data.
diff --git a/unit_tests/unit_test_rules.mk b/unit_tests/unit_test_rules.mk
index aa6ba9d064..69594c6fba 100644
--- a/unit_tests/unit_test_rules.mk
+++ b/unit_tests/unit_test_rules.mk
@@ -63,7 +63,7 @@ endif
 
 # C++ specific options here (added to USE_OPT).
 ifeq ($(USE_CPPOPT),)
-  USE_CPPOPT = -std=gnu++17 -fno-rtti -fpermissive -fno-use-cxa-atexit
+  USE_CPPOPT = -std=gnu++2a -fno-rtti -fpermissive -fno-use-cxa-atexit
 endif
 
 # Enable this if you want the linker to remove unused code and data