diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index 93b8c66f3..09417b5f1 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -78,3 +78,7 @@ PRODUCT_BUILD_SUPER_EMPTY_IMAGE := false
 
 # Always build modules from source
 MODULE_BUILD_FROM_SOURCE := true
+
+# Additional settings used in all GSI builds
+PRODUCT_PRODUCT_PROPERTIES += \
+    ro.crypto.metadata_init_delete_all_keys.enabled=false \