diff --git a/changelog/changes/2024-02-23-coreos-cloudinit.md b/changelog/changes/2024-02-23-coreos-cloudinit.md
new file mode 100644
index 0000000000..18ab14c76f
--- /dev/null
+++ b/changelog/changes/2024-02-23-coreos-cloudinit.md
@@ -0,0 +1 @@
+- ⚠ Removed coreos-cloudinit support for automatic keys conversion (e.g `reboot-strategy` -> `reboot_strategy`) ([scripts#1687](https://github.com/flatcar/scripts/pull/1687))
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r7.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r8.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r7.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r8.ebuild
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
index a9abc0901d..a9aebf08be 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild
@@ -12,7 +12,7 @@ inherit cros-workon systemd toolchain-funcs udev coreos-go
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="47d54a38e766a30c7ab9caabf2292e885505ffe0" # flatcar-master
+	CROS_WORKON_COMMIT="a7bc5f0050ab3493807ec69977cda26b882b4aad" # flatcar-master
 	KEYWORDS="amd64 arm64"
 fi