diff --git a/.gitmodules b/.gitmodules
index 96c69ce1a3..18688528ff 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "firmware/ChibiOS"]
 	path = firmware/ChibiOS
 	url = https://github.com/rusefi/ChibiOS.git
-	branch = stable_20.3.x.rusefi
+	branch = stable_20.3.x.rusefi_clean_history
 [submodule "firmware/ChibiOS-Contrib"]
 	path = firmware/ChibiOS-Contrib
 	url = https://github.com/rusefi/ChibiOS-Contrib.git
diff --git a/firmware/ChibiOS b/firmware/ChibiOS
index 51d27826a3..9ac21ccdd9 160000
--- a/firmware/ChibiOS
+++ b/firmware/ChibiOS
@@ -1 +1 @@
-Subproject commit 51d27826a324acdeb80cd0164b7ba7e1124c4c49
+Subproject commit 9ac21ccdd9bd6a315e4de96d6b488a65dd84d362