diff --git a/CHANGELOG.md b/CHANGELOG.md
index 25fbc81..61276f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,10 @@ Changes are identified by the date of the released firmware including them. If
 you are running System76 Open Firmware, opening the boot menu will show this
 date followed by an underscore and a short git revision.
 
+## unreleased
+
+- Updated Rust toolchain to nightly-2022-03-18
+
 ## 2022-11-14
 
 - lemp11: Added workaround to force S0ix entry on suspend
diff --git a/apps/firmware-setup b/apps/firmware-setup
index d016fe3..88ff9a0 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit d016fe3cf3776b69bb7c2f9c5d7b9e18060e2fbd
+Subproject commit 88ff9a046fcc409ab6f532b320f6bfc3f281de5e
diff --git a/apps/firmware-update b/apps/firmware-update
index a9b7596..4f5eb34 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit a9b75968d56f368d84e83bcee7348008c70853e6
+Subproject commit 4f5eb34d85bb2d38ba3db813c95dadd64ac7e548
diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index 4d97fdd..f31d204 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2021-06-15"
+channel = "nightly-2022-03-18"
 components = ["rust-src"]