diff --git a/changelog/bugfixes/2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md b/changelog/bugfixes/2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md
new file mode 100644
index 00000000000..933d4308c5e
--- /dev/null
+++ b/changelog/bugfixes/2024-05-31-disable-dhcp-rapid-commit-for-cloudsigma.md
@@ -0,0 +1 @@
+- Disabled the new DHCP RapidCommit feature which is enabled by default since systemd 255. CloudSigma provides an incompatible implementation which results in cloud-init not being applied as no IP is issued. See: ([flatcar/scripts#2016](https://github.com/flatcar/scripts/pull/2016))
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
index f799bf4b4c0..176b17d1b11 100644
--- a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
+++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/files/cloud-config.yml
@@ -7,3 +7,23 @@ coreos:
     version-id: @@OEM_VERSION_ID@@
     home-url: https://www.cloudsigma.com/
     bug-report-url: https://issues.flatcar.org
+  units:
+    - name: za-dhcp-no-rapid-commit.network
+      content: |
+        [Network]
+        DHCP=yes
+        KeepConfiguration=dhcp-on-stop
+        IPv6AcceptRA=true
+
+        [Match]
+        Name=*
+        Type=!loopback bridge tunnel vxlan wireguard
+        Driver=!veth dummy
+
+        [DHCP]
+        UseMTU=true
+        UseDomains=true
+
+        [DHCPv4]
+        RoutesToDNS=false
+        RapidCommit=false
\ No newline at end of file
diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r6.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r5.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/oem-cloudsigma/oem-cloudsigma-0.0.3-r6.ebuild