diff --git a/apps/firmware-setup b/apps/firmware-setup
index b80e333..58b2fe3 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit b80e333d97a132299480110c06857101466df305
+Subproject commit 58b2fe35028d75398c60bdd4c4092390bd0b7818
diff --git a/apps/firmware-smmstore b/apps/firmware-smmstore
index d3e0335..00c44d4 160000
--- a/apps/firmware-smmstore
+++ b/apps/firmware-smmstore
@@ -1 +1 @@
-Subproject commit d3e03359d26a6e2fb057d15493a82720b6922602
+Subproject commit 00c44d42ac59055382aff96aef805ea94838b906
diff --git a/apps/firmware-update b/apps/firmware-update
index 5da9106..daf5d50 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit 5da9106820126a930d72bbe0a2c07960b14c4920
+Subproject commit daf5d5074cfaf67a6355c09fe7c4482e618d3c60
diff --git a/apps/gop-policy b/apps/gop-policy
index 48ef49a..fb2f2c0 160000
--- a/apps/gop-policy
+++ b/apps/gop-policy
@@ -1 +1 @@
-Subproject commit 48ef49aad59113cc378c1a08ec1bdfcf762e428b
+Subproject commit fb2f2c04cb1e68ebb1a3a399a6ccd27cc90cc5c0
diff --git a/libs/ecflash b/libs/ecflash
index 1f94793..b08db29 160000
--- a/libs/ecflash
+++ b/libs/ecflash
@@ -1 +1 @@
-Subproject commit 1f947933e189b0036d9d8e6f6ddb5d7146bb745b
+Subproject commit b08db293137726bc576da6bef6d57adf3e4adc97
diff --git a/libs/intel-spi b/libs/intel-spi
index 0f38341..b918b2b 160000
--- a/libs/intel-spi
+++ b/libs/intel-spi
@@ -1 +1 @@
-Subproject commit 0f383418aeef7d268dd806aaed17537adffbf9e0
+Subproject commit b918b2b1fe099c668a1341e920a01c94a11a6e06
diff --git a/libs/uefi b/libs/uefi
index 56fede3..81e6087 160000
--- a/libs/uefi
+++ b/libs/uefi
@@ -1 +1 @@
-Subproject commit 56fede39e7a09c3c2d3df4348ec8d4bc06feaa2c
+Subproject commit 81e60876b364163fa2ba77a2adc34c520f0dea94
diff --git a/libs/uefi_alloc b/libs/uefi_alloc
index 4a69eba..7a74e17 160000
--- a/libs/uefi_alloc
+++ b/libs/uefi_alloc
@@ -1 +1 @@
-Subproject commit 4a69eba2ce193354e73a0a9a323bda1710125438
+Subproject commit 7a74e171cdd2aee02efbb655652ef4746cb0a9b8
diff --git a/libs/uefi_std b/libs/uefi_std
index 6fe908e..a069826 160000
--- a/libs/uefi_std
+++ b/libs/uefi_std
@@ -1 +1 @@
-Subproject commit 6fe908e6db85e274d919a58392b6c7d7b912254d
+Subproject commit a069826ad5c1f55b8548bd7004273f768cd71812
diff --git a/rust-toolchain b/rust-toolchain.toml
similarity index 55%
rename from rust-toolchain
rename to rust-toolchain.toml
index 3baacd4..4d97fdd 100644
--- a/rust-toolchain
+++ b/rust-toolchain.toml
@@ -1,3 +1,3 @@
 [toolchain]
-channel = "nightly-2020-07-27"
+channel = "nightly-2021-06-15"
 components = ["rust-src"]
diff --git a/scripts/modeltool/Cargo.lock b/scripts/modeltool/Cargo.lock
index c319e12..f0971de 100644
--- a/scripts/modeltool/Cargo.lock
+++ b/scripts/modeltool/Cargo.lock
@@ -1,46 +1,45 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "bitflags"
-version = "1.2.1"
+version = "1.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "modeltool"
 version = "0.1.0"
 dependencies = [
- "redox_intelflash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "system76_ecflash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "redox_intelflash",
+ "system76_ecflash",
 ]
 
 [[package]]
 name = "plain"
 version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
 
 [[package]]
 name = "redox_intelflash"
-version = "0.1.0"
+version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d8e51d17548d82fa194ca49c6adf81fce4a45bbddfdd7d35f68725cec1943f5"
 dependencies = [
- "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "redox_uefi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bitflags",
+ "plain",
+ "redox_uefi",
 ]
 
 [[package]]
 name = "redox_uefi"
-version = "0.1.0"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c63a3180c5aba47178029b21c1615fbdf87d2bf682669708ea15e9c71eb8935"
 
 [[package]]
 name = "system76_ecflash"
 version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
-"checksum plain 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6"
-"checksum redox_intelflash 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49e6f45d8c070090589005869e0b776f52c735f9b5411fca369229135fa1dbd8"
-"checksum redox_uefi 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dafc50645c27c55ca19d27645a6d91e2a8cbc7aabb2ed024ce914512c75e1217"
-"checksum system76_ecflash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "18ead2ebfbf58e9ddf09b21562f834c1846e92553069120247568c3213c3a9fc"
+source = "git+https://github.com/system76/ecflash?rev=b08db293#b08db293137726bc576da6bef6d57adf3e4adc97"
diff --git a/scripts/modeltool/Cargo.toml b/scripts/modeltool/Cargo.toml
index d0140fe..2de9097 100644
--- a/scripts/modeltool/Cargo.toml
+++ b/scripts/modeltool/Cargo.toml
@@ -5,5 +5,5 @@ authors = ["Jeremy Soller <jeremy@system76.com>"]
 edition = "2018"
 
 [dependencies]
-redox_intelflash = "0.1.0"
-system76_ecflash = "0.1.0"
+redox_intelflash = "0.1.3"
+system76_ecflash = { git = "https://github.com/system76/ecflash", rev = "b08db293" }