diff --git a/apps/firmware-setup b/apps/firmware-setup
index ae3ee51..c0ecd4e 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit ae3ee51a977386c8aab048adfe9ebca6e9192394
+Subproject commit c0ecd4e8d5157f2446f5488a85a3e574d95ec13b
diff --git a/apps/firmware-smmstore b/apps/firmware-smmstore
index fb267b8..0e6b1c1 160000
--- a/apps/firmware-smmstore
+++ b/apps/firmware-smmstore
@@ -1 +1 @@
-Subproject commit fb267b83effb1ecce1babf38990e2dcbce0dfa90
+Subproject commit 0e6b1c1c30389141d08323e7b427a6bed130d8ac
diff --git a/apps/firmware-update b/apps/firmware-update
index 079b0d2..cbc5dbc 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit 079b0d2e7e0fc6f305c928f234c3b39a5825bdc4
+Subproject commit cbc5dbcf6f5d1feb78870d4467cf46ac3186b77a
diff --git a/apps/gop-policy b/apps/gop-policy
index e9cb8db..4610cc6 160000
--- a/apps/gop-policy
+++ b/apps/gop-policy
@@ -1 +1 @@
-Subproject commit e9cb8db425ad61009a46c9693148eb3127dff774
+Subproject commit 4610cc6e2ddb8927896ac85708e366286969166e
diff --git a/rust-toolchain b/rust-toolchain
index 2cf3e8f..40973da 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-11-04
+nightly-2020-07-27
diff --git a/scripts/build.sh b/scripts/build.sh
index 3c3ed53..2429005 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -93,9 +93,9 @@ then
     # Rebuild firmware-update
     export BASEDIR="system76_${MODEL}_${VERSION}"
     pushd apps/firmware-update >/dev/null
-      rm -rf "build/x86_64-efi-pe"
-      make "build/x86_64-efi-pe/boot.img"
-      cp -v "build/x86_64-efi-pe/boot.img" "${USB}.partial"
+      rm -rf "build/x86_64-unknown-uefi"
+      make "build/x86_64-unknown-uefi/boot.img"
+      cp -v "build/x86_64-unknown-uefi/boot.img" "${USB}.partial"
     popd >/dev/null
 
     # Copy firmware to USB image