diff --git a/util/smmstoretool/fv.c b/util/smmstoretool/fv.c
index 8ac8646d92..2744292761 100644
--- a/util/smmstoretool/fv.c
+++ b/util/smmstoretool/fv.c
@@ -73,7 +73,6 @@ bool fv_init(struct mem_range_t fv)
 	++vol_hdr_dst->Checksum;
 
 	const VARIABLE_STORE_HEADER var_store_hdr = {
-		// Authentication-related fields will be filled with 0xff.
 		.Signature = EfiAuthenticatedVariableGuid,
 		// Actual size of the storage is block size, the rest is
 		// Fault Tolerant Write (FTW) space and the FTW spare space.
diff --git a/util/smmstoretool/vs.c b/util/smmstoretool/vs.c
index 0060e69b02..f78ed0aad2 100644
--- a/util/smmstoretool/vs.c
+++ b/util/smmstoretool/vs.c
@@ -110,6 +110,10 @@ static void store_var(const struct var_t *var, bool is_auth_var_store, uint8_t *
 		hdr.NameSize = var->name_size;
 		hdr.DataSize = var->data_size;
 
+		hdr.MonotonicCount = 0;
+		memset(&hdr.TimeStamp, 0, sizeof(hdr.TimeStamp));
+		//hdr.PubKeyIndex = 0;
+
 		memcpy(data, &hdr, sizeof(hdr));
 		data += sizeof(hdr);
 	} else {