diff --git a/changelog/bugfixes/2023-05-04-locksmith-delay.md b/changelog/bugfixes/2023-05-04-locksmith-delay.md
new file mode 100644
index 0000000000..15e7c419f0
--- /dev/null
+++ b/changelog/bugfixes/2023-05-04-locksmith-delay.md
@@ -0,0 +1 @@
+- Restored the reboot warning and delay for non-SSH console sessions ([locksmith#21](https://github.com/flatcar/locksmith/pull/21))
diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
index 0b063ed000..dc9ca55b4e 100644
--- a/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/app-admin/locksmith/locksmith-9999.ebuild
@@ -11,7 +11,7 @@ inherit cros-workon systemd coreos-go
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="c4cca93a15c7b7fd175e6687a83fc2725029a17a" # flatcar-master
+	CROS_WORKON_COMMIT="b5fb1347fa5c5be5ce3cb39c80e4d3ae599675d1" # flatcar-master
 	KEYWORDS="amd64 arm64"
 fi