diff --git a/build_library/disk_layout.json b/build_library/disk_layout.json
index 5d90ccc6c6..33ae6cb473 100644
--- a/build_library/disk_layout.json
+++ b/build_library/disk_layout.json
@@ -16,7 +16,7 @@
         "blocks":"262144",
         "fs_type":"vfat",
         "mount":"/boot",
-        "features": ["hybrid"]
+        "features": []
       },
       "2":{
         "label":"BIOS-BOOT",
diff --git a/changelog/bugfixes/2025-02-14-fix-efi-partition-flags.md b/changelog/bugfixes/2025-02-14-fix-efi-partition-flags.md
new file mode 100644
index 0000000000..998dd47bd3
--- /dev/null
+++ b/changelog/bugfixes/2025-02-14-fix-efi-partition-flags.md
@@ -0,0 +1 @@
+- Fix non-conforming GPT partition table ([flatcar/Flatcar#1651](https://github.com/flatcar/Flatcar/issues/1651)