diff --git a/BoardConfig.mk b/BoardConfig.mk
index a00f21f7741c137db731431132e8a4af0c878091..cbf2fbe134a1f8ee9edaec876634503685bd9906 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -177,11 +177,15 @@ SYSTEM_EXT_PRIVATE_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/private
 SYSTEM_EXT_PUBLIC_SEPOLICY_DIRS += $(DEVICE_PATH)/sepolicy/public
 
 # Verified Boot
+SPL_PARTS := $(subst -, ,$(PLATFORM_SECURITY_PATCH))
+SPL_YEAR := $(word 1,$(SPL_PARTS))
+SPL_MONTH := $(word 2,$(SPL_PARTS))
+FIXED_DAY_SPL := $(SPL_YEAR)-$(SPL_MONTH)-05 # Force day to 05 ALWAYS
 BOARD_AVB_ENABLE := true
 BOARD_AVB_VBMETA_SYSTEM := system system_ext product
 BOARD_AVB_VBMETA_SYSTEM_KEY_PATH := external/avb/test/data/testkey_rsa2048.pem
 BOARD_AVB_VBMETA_SYSTEM_ALGORITHM := SHA256_RSA2048
-BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(PLATFORM_SECURITY_PATCH_TIMESTAMP)
+BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX := $(shell date -d 'TZ="GMT" $(FIXED_DAY_SPL)' +%s)
 BOARD_AVB_VBMETA_SYSTEM_ROLLBACK_INDEX_LOCATION := 2
 
 # Wifi