diff --git a/board/cr50/board.c b/board/cr50/board.c
index 408cd55c9e..ea057f4a36 100644
--- a/board/cr50/board.c
+++ b/board/cr50/board.c
@@ -647,14 +647,14 @@ int flash_regions_to_enable(struct g_flash_region *regions,
 
 	/* Enable access to the NVRAM partition A region */
 	regions[1].reg_base = CONFIG_MAPPED_STORAGE_BASE +
-		CONFIG_FLASH_NVMEM_OFFSET_A;
-	regions[1].reg_size = NVMEM_PARTITION_SIZE;
+		CFG_TOP_A_OFF;
+	regions[1].reg_size = CFG_TOP_SIZE;
 	regions[1].reg_perms = FLASH_REGION_EN_ALL;
 
 	/* Enable access to the NVRAM partition B region */
 	regions[2].reg_base = CONFIG_MAPPED_STORAGE_BASE +
-		CONFIG_FLASH_NVMEM_OFFSET_B;
-	regions[2].reg_size = NVMEM_PARTITION_SIZE;
+		CFG_TOP_B_OFF;
+	regions[2].reg_size = CFG_TOP_SIZE;
 	regions[2].reg_perms = FLASH_REGION_EN_ALL;
 
 	return 3;
diff --git a/board/cr50/board.h b/board/cr50/board.h
index 53411170de..d21951a457 100644
--- a/board/cr50/board.h
+++ b/board/cr50/board.h
@@ -43,20 +43,27 @@
 
 #define CONFIG_CRC8
 
+/* Non-volatile counter storage for U2F */
+#define CONFIG_FLASH_NVCOUNTER
+#define CONFIG_FLASH_NVCTR_SIZE CONFIG_FLASH_BANK_SIZE
+#define CONFIG_FLASH_NVCTR_BASE_A (CONFIG_PROGRAM_MEMORY_BASE + \
+				   CFG_TOP_A_OFF)
+#define CONFIG_FLASH_NVCTR_BASE_B (CONFIG_PROGRAM_MEMORY_BASE + \
+				   CFG_TOP_B_OFF)
 /* We're using TOP_A for partition 0, TOP_B for partition 1 */
 #define CONFIG_FLASH_NVMEM
 /* Offset to start of NvMem area from base of flash */
-#define CONFIG_FLASH_NVMEM_OFFSET_A (CFG_TOP_A_OFF)
-#define CONFIG_FLASH_NVMEM_OFFSET_B (CFG_TOP_B_OFF)
+#define CONFIG_FLASH_NVMEM_OFFSET_A (CFG_TOP_A_OFF + CONFIG_FLASH_NVCTR_SIZE)
+#define CONFIG_FLASH_NVMEM_OFFSET_B (CFG_TOP_B_OFF + CONFIG_FLASH_NVCTR_SIZE)
 /* Address of start of Nvmem area */
 #define CONFIG_FLASH_NVMEM_BASE_A (CONFIG_PROGRAM_MEMORY_BASE + \
 				 CONFIG_FLASH_NVMEM_OFFSET_A)
 #define CONFIG_FLASH_NVMEM_BASE_B (CONFIG_PROGRAM_MEMORY_BASE + \
 				 CONFIG_FLASH_NVMEM_OFFSET_B)
 /* Size partition in NvMem */
-#define NVMEM_PARTITION_SIZE CFG_TOP_SIZE
+#define NVMEM_PARTITION_SIZE (CFG_TOP_SIZE - CONFIG_FLASH_NVCTR_SIZE)
 /* Size in bytes of NvMem area */
-#define CONFIG_FLASH_NVMEM_SIZE (CFG_TOP_SIZE * NVMEM_NUM_PARTITIONS)
+#define CONFIG_FLASH_NVMEM_SIZE (NVMEM_PARTITION_SIZE * NVMEM_NUM_PARTITIONS)
 /* Enable <key, value> variable support. */
 #define CONFIG_FLASH_NVMEM_VARS
 #define NVMEM_CR50_SIZE 272
diff --git a/chip/g/config_chip.h b/chip/g/config_chip.h
index 838f38f812..bfcd912914 100644
--- a/chip/g/config_chip.h
+++ b/chip/g/config_chip.h
@@ -95,7 +95,7 @@
  * use these two areas for the same thing, it's just more convenient to make
  * them the same size.
  */
-#define CFG_TOP_SIZE  0x3000
+#define CFG_TOP_SIZE  0x3800
 #define CFG_TOP_A_OFF (CFG_FLASH_HALF - CFG_TOP_SIZE)
 #define CFG_TOP_B_OFF (CONFIG_FLASH_SIZE - CFG_TOP_SIZE)