diff --git a/module/common_func.sh b/module/common_func.sh
index 6ea9032..40b1a26 100644
--- a/module/common_func.sh
+++ b/module/common_func.sh
@@ -37,6 +37,13 @@ resetprop_hexpatch() {
         | dd obs=1 count=93 seek=$((NAMEOFFSET-93)) conv=notrunc of="$PROPFILE"
 }
 
+# delprop_if_exist <prop name>
+delprop_if_exist() {
+    local NAME="$1"
+
+    [ -n "$(resetprop "$NAME")" ] && resetprop --delete "$NAME"
+}
+
 # resetprop_if_diff <prop name> <expected value>
 resetprop_if_diff() {
     local NAME="$1"
diff --git a/module/post-fs-data.sh b/module/post-fs-data.sh
index d96c7cb..a557241 100644
--- a/module/post-fs-data.sh
+++ b/module/post-fs-data.sh
@@ -37,6 +37,11 @@ for PROP in $(resetprop | grep -oE 'ro.*.build.type'); do
     resetprop_if_diff $PROP user
 done
 resetprop_if_diff ro.adb.secure 1
+if ! $SKIPDELPROP; then
+    delprop_if_exist ro.boot.verifiedbooterror
+    delprop_if_exist ro.boot.verifyerrorpart
+fi
+resetprop_if_diff ro.boot.veritymode.managed yes
 resetprop_if_diff ro.debuggable 0
 resetprop_if_diff ro.force.debuggable 0
 resetprop_if_diff ro.secure 1
diff --git a/module/service.sh b/module/service.sh
index 79568f6..162fd9d 100644
--- a/module/service.sh
+++ b/module/service.sh
@@ -11,8 +11,8 @@ resetprop_if_match vendor.boot.mode recovery unknown
 # SELinux
 resetprop_if_diff ro.boot.selinux enforcing
 # use delete since it can be 0 or 1 for enforcing depending on OEM
-if ! $SKIPDELPROP && [ -n "$(resetprop ro.build.selinux)" ]; then
-    resetprop --delete ro.build.selinux
+if ! $SKIPDELPROP; then
+    delprop_if_exist ro.build.selinux
 fi
 # use toybox to protect stat access time reading
 if [ "$(toybox cat /sys/fs/selinux/enforce)" = "0" ]; then