diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties
index fe6821a4c..4543d815d 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.properties
@@ -180,8 +180,14 @@ option.cpp.compiler.std.cpp1z=ISO 2017 C++ (-std=c++1z, deprecated)
 option.cpp.compiler.std.cpp17=ISO 2017 C++ (-std=c++17)
 option.cpp.compiler.std.gnucpp1z=GNU ISO 2017 C++ (-std=gnu++1z, deprecated)
 option.cpp.compiler.std.gnucpp17=GNU ISO 2017 C++ (-std=gnu++17)
-option.cpp.compiler.std.cpp2a=Next ISO C++ (-std=c++2a)
-option.cpp.compiler.std.gnucpp2a=Next GNU ISO C++ (-std=gnu++2a)
+option.cpp.compiler.std.cpp2a=ISO C++ 2020 (-std=c++2a, deprecated)
+option.cpp.compiler.std.cpp20=ISO C++ 2020 (-std=c++20)
+option.cpp.compiler.std.gnucpp2a=GNU ISO C++ 2020 (-std=gnu++2a, deprecated)
+option.cpp.compiler.std.gnucpp20=GNU ISO C++ 2020 (-std=gnu++20)
+option.cpp.compiler.std.cpp2b=ISO C++ 2023 (-std=c++2a, deprecated)
+option.cpp.compiler.std.cpp23=ISO C++ 2023 (-std=c++20)
+option.cpp.compiler.std.gnucpp2b=GNU ISO C++ 2023 (-std=gnu++2b, deprecated)
+option.cpp.compiler.std.gnucpp23=GNU ISO C++ 2023 (-std=gnu++23)
 
 option.cpp.compiler.abiversion=ABI version
 option.cpp.compiler.abiversion.default=Toolchain default (0, most conforming)
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
index 1e0c64895..5e906bfbc 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.arm.core/plugin.xml
@@ -2585,11 +2585,41 @@
 						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp2a"
 						name="%option.cpp.compiler.std.cpp2a">
 					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=c++20"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp20"
+						name="%option.cpp.compiler.std.cpp20">
+					</enumeratedOptionValue>
 					<enumeratedOptionValue
 						command="-std=gnu++2a"
 						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp2a"
 						name="%option.cpp.compiler.std.gnucpp2a">
 					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=gnu++20"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp20"
+						name="%option.cpp.compiler.std.gnucpp20">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=c++2b"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp2b"
+						name="%option.cpp.compiler.std.cpp2b">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=c++23"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp23"
+						name="%option.cpp.compiler.std.cpp23">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=gnu++2b"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp2b"
+						name="%option.cpp.compiler.std.gnucpp2b">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=gnu++23"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp23"
+						name="%option.cpp.compiler.std.gnucpp23">
+					</enumeratedOptionValue>
 				</option>
 				<option
 					category="ilg.gnuarmeclipse.managedbuild.cross.optionCategory.cpp.compiler.optimization"
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties
index 2dcb00172..0f2ca26ec 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.properties
@@ -151,8 +151,14 @@ option.cpp.compiler.std.cpp1z=ISO 2017 C++ (-std=c++1z, deprecated)
 option.cpp.compiler.std.cpp17=ISO 2017 C++ (-std=c++17)
 option.cpp.compiler.std.gnucpp1z=GNU ISO 2017 C++ (-std=gnu++1z, deprecated)
 option.cpp.compiler.std.gnucpp17=GNU ISO 2017 C++ (-std=gnu++17)
-option.cpp.compiler.std.cpp2a=Next ISO C++ (-std=c++2a)
-option.cpp.compiler.std.gnucpp2a=Next GNU ISO C++ (-std=gnu++2a)
+option.cpp.compiler.std.cpp2a=ISO C++ 2020 (-std=c++2a, deprecated)
+option.cpp.compiler.std.cpp20=ISO C++ 2020 (-std=c++20)
+option.cpp.compiler.std.gnucpp2a=GNU ISO C++ 2020 (-std=gnu++2a, deprecated)
+option.cpp.compiler.std.gnucpp20=GNU ISO C++ 2020 (-std=gnu++20)
+option.cpp.compiler.std.cpp2b=ISO C++ 2023 (-std=c++2a, deprecated)
+option.cpp.compiler.std.cpp23=ISO C++ 2023 (-std=c++20)
+option.cpp.compiler.std.gnucpp2b=GNU ISO C++ 2023 (-std=gnu++2b, deprecated)
+option.cpp.compiler.std.gnucpp23=GNU ISO C++ 2023 (-std=gnu++23)
 
 option.cpp.compiler.abiversion=ABI version
 option.cpp.compiler.abiversion.default=Toolchain default (0, most conforming)
diff --git a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
index b39758c66..d3d669dfd 100644
--- a/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
+++ b/plugins/org.eclipse.embedcdt.managedbuild.cross.riscv.core/plugin.xml
@@ -1478,14 +1478,44 @@
 					</enumeratedOptionValue>
 					<enumeratedOptionValue
 						command="-std=c++2a"
-						id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.cpp.compiler.std.cpp2a"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp2a"
 						name="%option.cpp.compiler.std.cpp2a">
 					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=c++20"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp20"
+						name="%option.cpp.compiler.std.cpp20">
+					</enumeratedOptionValue>
 					<enumeratedOptionValue
 						command="-std=gnu++2a"
-						id="ilg.gnumcueclipse.managedbuild.cross.riscv.option.cpp.compiler.std.gnucpp2a"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp2a"
 						name="%option.cpp.compiler.std.gnucpp2a">
 					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=gnu++20"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp20"
+						name="%option.cpp.compiler.std.gnucpp20">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=c++2b"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp2b"
+						name="%option.cpp.compiler.std.cpp2b">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=c++23"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.cpp23"
+						name="%option.cpp.compiler.std.cpp23">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=gnu++2b"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp2b"
+						name="%option.cpp.compiler.std.gnucpp2b">
+					</enumeratedOptionValue>
+					<enumeratedOptionValue
+						command="-std=gnu++23"
+						id="ilg.gnuarmeclipse.managedbuild.cross.option.cpp.compiler.std.gnucpp23"
+						name="%option.cpp.compiler.std.gnucpp23">
+					</enumeratedOptionValue>
 				</option>
 				<option
 					category="ilg.gnumcueclipse.managedbuild.cross.riscv.optionCategory.cpp.compiler.optimization"