diff --git a/groups/boot-arch/project-celadon/BoardConfig.mk b/groups/boot-arch/project-celadon/BoardConfig.mk
index 17f41c572..7d709d04b 100644
--- a/groups/boot-arch/project-celadon/BoardConfig.mk
+++ b/groups/boot-arch/project-celadon/BoardConfig.mk
@@ -26,7 +26,7 @@ TARGET_RECOVERY_PIXEL_FORMAT := "BGRA_8888"
 #
 
 # NOTE: These values must be kept in sync with BOARD_GPT_INI
-BOARD_BOOTIMAGE_PARTITION_SIZE ?= 42991616
+BOARD_BOOTIMAGE_PARTITION_SIZE ?= 47185920
 SYSTEM_PARTITION_SIZE = $(shell echo {{system_partition_size}}*1024*1024 | bc)
 {{^dynamic-partitions}}
 BOARD_SYSTEMIMAGE_PARTITION_SIZE ?= $(SYSTEM_PARTITION_SIZE)
diff --git a/groups/boot-arch/project-celadon/fstab b/groups/boot-arch/project-celadon/fstab
index 40cba4f19..75d6d0942 100644
--- a/groups/boot-arch/project-celadon/fstab
+++ b/groups/boot-arch/project-celadon/fstab
@@ -5,6 +5,7 @@
 # specify MF_CHECK, and must come before any filesystems that do specify MF_CHECK
 {{#dynamic-partitions}}
 system   /system  {{system_fs}} ro{{#system_fs_ext4}},barrier=1{{/system_fs_ext4}} wait{{#slot-ab}},slotselect{{/slot-ab}},avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount
+system   /system  ext4 ro,barrier=1  wait{{#slot-ab}},slotselect{{/slot-ab}},avb_keys=/avb/q-gsi.avbpubkey:/avb/r-gsi.avbpubkey:/avb/s-gsi.avbpubkey,avb=vbmeta,logical,first_stage_mount
 {{/dynamic-partitions}}
 {{^dynamic-partitions}}
 /dev/block/by-name/system       /{{^slot-ab}}system{{/slot-ab}}         {{system_fs}}    ro                                                          wait{{#slot-ab}},slotselect{{/slot-ab}},avb
diff --git a/groups/boot-arch/project-celadon/gpt.ini b/groups/boot-arch/project-celadon/gpt.ini
index 56c6904d0..16041a5f0 100644
--- a/groups/boot-arch/project-celadon/gpt.ini
+++ b/groups/boot-arch/project-celadon/gpt.ini
@@ -54,7 +54,7 @@ type = fat
 
 [partition.boot]
 label = boot
-len = 41
+len = 45
 type = boot
 {{#slot-ab}}
 has_slot = true
diff --git a/groups/thermal/thermal-daemon/init.rc b/groups/thermal/thermal-daemon/init.rc
index aa6d305a8..d22b9b7d0 100644
--- a/groups/thermal/thermal-daemon/init.rc
+++ b/groups/thermal/thermal-daemon/init.rc
@@ -20,5 +20,5 @@ on post-fs-data
     setprop persist.vendor.thermal.mode thermal-daemon
     mkdir /data/vendor/thermal-daemon 0660 system system
 
-on property:sys.boot_completed=1 && property:vendor.thermal.enable=1
-    start thermal-daemon
+# on property:sys.boot_completed=1 && property:vendor.thermal.enable=1
+#    start thermal-daemon