diff --git a/target/product/gsi_release.mk b/target/product/gsi_release.mk
index d924d0bc11..bd7c4ab3eb 100644
--- a/target/product/gsi_release.mk
+++ b/target/product/gsi_release.mk
@@ -74,3 +74,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 \