diff --git a/Android.mk b/Android.mk
index 4f7ced26..7e0ad122 100644
--- a/Android.mk
+++ b/Android.mk
@@ -156,7 +156,7 @@ LOCAL_STATIC_LIBRARIES := \
     libhealthstoragedefault \
     libhidltransport \
     libhidlbase \
-    libhwbinder_nolto \
+    libhwbinder_noltopgo \
     libvndksupport \
     libbatterymonitor
 
diff --git a/roots.cpp b/roots.cpp
index 8907bbd9..184e7992 100644
--- a/roots.cpp
+++ b/roots.cpp
@@ -333,6 +333,7 @@ int format_volume(const char* volume, const char* directory) {
     "-f",
     "-O", "encrypt",
     "-O", "quota",
+    "-O", "verity",
     "-w", std::to_string(kSectorSize),
     v->blk_device,
   };
diff --git a/updater/install.cpp b/updater/install.cpp
index 6732ab89..9be7645f 100644
--- a/updater/install.cpp
+++ b/updater/install.cpp
@@ -544,12 +544,10 @@ Value* FormatFn(const char* name, State* state, const std::vector<std::unique_pt
     const char* f2fs_argv[] = { "mkfs.f2fs",
                                 "-d1",
                                 "-f",
-                                "-O",
-                                "encrypt",
-                                "-O",
-                                "quota",
-                                "-w",
-                                "512",
+                                "-O", "encrypt",
+                                "-O", "quota",
+                                "-O", "verity",
+                                "-w", "512",
                                 location.c_str(),
                                 (size < 512) ? nullptr : num_sectors.c_str(),
                                 nullptr };