diff --git a/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in b/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
index 0209ee593c..6f6aa0e3e3 100644
--- a/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
+++ b/components/soc/esp32p4/include/soc/Kconfig.soc_caps.in
@@ -595,6 +595,10 @@ config SOC_CPU_HAS_ZC_EXTENSIONS
     bool
     default y
 
+config SOC_CPU_ZCMP_WORKAROUND
+    bool
+    default y
+
 config SOC_CPU_ZCMP_PUSH_REVERSED
     bool
     default y
diff --git a/components/soc/esp32p4/include/soc/soc_caps.h b/components/soc/esp32p4/include/soc/soc_caps.h
index e9bd1dd7b5..450af84fac 100644
--- a/components/soc/esp32p4/include/soc/soc_caps.h
+++ b/components/soc/esp32p4/include/soc/soc_caps.h
@@ -211,6 +211,7 @@
 
 #define SOC_CPU_HAS_ZC_EXTENSIONS       1
 
+#define SOC_CPU_ZCMP_WORKAROUND         1
 #define SOC_CPU_ZCMP_PUSH_REVERSED      1
 #define SOC_CPU_ZCMP_POPRET_ISSUE       1
 
diff --git a/examples/storage/custom_flash_driver/sdkconfig.ci.default b/examples/storage/custom_flash_driver/sdkconfig.ci.default
index 47265c6563..f4b81b98e6 100644
--- a/examples/storage/custom_flash_driver/sdkconfig.ci.default
+++ b/examples/storage/custom_flash_driver/sdkconfig.ci.default
@@ -2,4 +2,4 @@ CONFIG_BOOTLOADER_LOG_LEVEL_DEBUG=y
 CONFIG_BOOTLOADER_LOG_LEVEL=4
 CONFIG_ESPTOOLPY_FLASHMODE_QIO=y
 # Bootloader overlapped with partition table after we enabled LOGD for bootloader. Move the partition table a bit to fix the issue on CI.
-CONFIG_PARTITION_TABLE_OFFSET=0x9000
+CONFIG_PARTITION_TABLE_OFFSET=0xA000