diff --git a/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md
new file mode 100644
index 0000000000..bcf885c871
--- /dev/null
+++ b/changelog/bugfixes/2024-03-25-disable-user-configdrive-on-openstack.md
@@ -0,0 +1 @@
+- Disabled user-configdrive.service on OpenStack when config drive is used, which caused the hostname to be overwritten. The coreos-cloudinit.service unit already runs on OpenStack if the system is not configured via ignition. ([Flatcar#1385](https://github.com/flatcar/Flatcar/issues/1385))
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..512ac9f8ec 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="7412fe91604b67d2ba66306726288392c3017403" # flatcar-3815-backport
 	KEYWORDS="amd64 arm64"
 fi