diff --git a/board/daisy/fmap.dts b/board/daisy/fmap.dts
index 87ba2e9..e4ed961 100644
--- a/board/daisy/fmap.dts
+++ b/board/daisy/fmap.dts
@@ -59,22 +59,22 @@
 			ver-minor = <0>;
 		};
 
-		ro-firmware-id {
-			label = "ro-frid";
-			reg = <0x00101000 0x00000100>;
-			read-only;
-			type = "blobstring fwid";
-		};
-
 		ro-gbb {
 			label = "gbb";
 
 			/* GBB offset must be aligned to 4K bytes */
-			reg = <0x00101100 0x000eef00>;
+			reg = <0x00101000 0x000eef00>;
 			read-only;
 			type = "blob gbb";
 		};
 
+		ro-firmware-id {
+			label = "ro-frid";
+			reg = <0x001eff00 0x00000100>;
+			read-only;
+			type = "blobstring fwid";
+		};
+
 		/* ---- Section: Vital-product data (VPD) ---- */
 		ro-vpd {
 			label = "ro-vpd";
diff --git a/board/peach_kirby/fmap.dts b/board/peach_kirby/fmap.dts
index 59c5e28..3db1c2d 100644
--- a/board/peach_kirby/fmap.dts
+++ b/board/peach_kirby/fmap.dts
@@ -49,22 +49,22 @@
 			ver-minor = <0>;
 		};
 
-		ro-firmware-id {
-			label = "ro-frid";
-			reg = <0x00101000 0x00000100>;
-			read-only;
-			type = "blobstring fwid";
-		};
-
 		ro-gbb {
 			label = "gbb";
 
 			/* GBB offset must be aligned to 4K bytes */
-			reg = <0x00101100 0x000eef00>;
+			reg = <0x00101000 0x000eef00>;
 			read-only;
 			type = "blob gbb";
 		};
 
+		ro-firmware-id {
+			label = "ro-frid";
+			reg = <0x001eff00 0x00000100>;
+			read-only;
+			type = "blobstring fwid";
+		};
+
 		/* ---- Section: Vital-product data (VPD) ---- */
 		ro-vpd {
 			label = "ro-vpd";
diff --git a/board/peach_pit/fmap.dts b/board/peach_pit/fmap.dts
index 85787ec..b04ad8f 100644
--- a/board/peach_pit/fmap.dts
+++ b/board/peach_pit/fmap.dts
@@ -49,22 +49,22 @@
 			ver-minor = <0>;
 		};
 
-		ro-firmware-id {
-			label = "ro-frid";
-			reg = <0x00101000 0x00000100>;
-			read-only;
-			type = "blobstring fwid";
-		};
-
 		ro-gbb {
 			label = "gbb";
 
 			/* GBB offset must be aligned to 4K bytes */
-			reg = <0x00101100 0x000eef00>;
+			reg = <0x00101000 0x000eef00>;
 			read-only;
 			type = "blob gbb";
 		};
 
+		ro-firmware-id {
+			label = "ro-frid";
+			reg = <0x001eff00 0x00000100>;
+			read-only;
+			type = "blobstring fwid";
+		};
+
 		/* ---- Section: Vital-product data (VPD) ---- */
 		ro-vpd {
 			label = "ro-vpd";