diff --git a/CHANGELOG.md b/CHANGELOG.md
index d65b500..38e9e55 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,14 +8,18 @@ features apply to your model and firmware version, see the
 
 ## unreleased
 
-- tgl: Updated Intel GOP driver to 17.0.1077
-- tgl: Updated VBT to 250
-- Updated Rust toolchain to nightly-2024-05-11
 - mtl: Updated FSP to D.0.A8.20
 - adl: Fixed USB 3.0 hubs in Type-C ports
 - rpl: Fixed USB 3.0 hubs in Type-C ports
 - Fixed touchpad in PS/2 mode
 - tgl: Updated CSME to 15.0.49.2573
+- Fixed unlock prompt showing when system is already unlocked
+
+## 2024-05-28
+
+- tgl: Updated Intel GOP driver to 17.0.1077
+- tgl: Updated VBT to 250
+- Updated Rust toolchain to nightly-2024-05-11
 
 ## 2024-05-17
 
diff --git a/apps/firmware-setup b/apps/firmware-setup
index 33bf2f3..1dc803d 160000
--- a/apps/firmware-setup
+++ b/apps/firmware-setup
@@ -1 +1 @@
-Subproject commit 33bf2f3d5e7b739e76f9069ea48f4f7b70fa4f4c
+Subproject commit 1dc803d978a6ca4f33d7828a29f43492157ba10c
diff --git a/apps/firmware-update b/apps/firmware-update
index 83b2ceb..b6d10f7 160000
--- a/apps/firmware-update
+++ b/apps/firmware-update
@@ -1 +1 @@
-Subproject commit 83b2ceb31bf21ec23c18784349d03497c413a1f6
+Subproject commit b6d10f7e0388640bd55c6acfe9ea962650f1d455