diff --git a/genpartitions.py b/genpartitions.py
index a9f29753b..0edca5574 100755
--- a/genpartitions.py
+++ b/genpartitions.py
@@ -1,4 +1,4 @@
-
+#!/usr/bin/python2
 
 # This is a layout for 4MB of flash
 # Name,   Type, SubType, Offset,  Size, Flags
@@ -10,7 +10,7 @@
 
 start = 0x9000
 nvssys = 0x3000
-nvsuser = 0x3000
+nvsuser = 0x2000 # NOTE: ti seems total size of nvssys MUST be 0x5000 or device will bootloop
 nvs = nvssys + nvsuser
 ota = 0x2000
 # app = 0x1c0000
@@ -38,4 +38,4 @@ app0,     app,  ota_0,   , 0x{app:x},
 app1,     app,  ota_1,   , 0x{app:x},
 spiffs,   data, spiffs,  , 0x{spi:x} """.format(**locals())
 
-print table
\ No newline at end of file
+print(table)
\ No newline at end of file
diff --git a/partition-table.csv b/partition-table.csv
index 3d0c7ccc3..e5d7ead77 100644
--- a/partition-table.csv
+++ b/partition-table.csv
@@ -1,8 +1,8 @@
 # This is autogenerated by genpartions.py - change that tool instead!
-# appsize=1950 KB, spiffs=128 KB, usernvs=12 KB
+# appsize=1952 KB, spiffs=128 KB, usernvs=8 KB
 # Name,   Type, SubType, Offset,  Size, Flags
-nvs,      data, nvs,     0x9000,  0x6000,
+nvs,      data, nvs,     0x9000,  0x5000,
 otadata,  data, ota,     , 0x2000,
-app0,     app,  ota_0,   , 0x1e7800,
-app1,     app,  ota_1,   , 0x1e7800,
+app0,     app,  ota_0,   , 0x1e8000,
+app1,     app,  ota_1,   , 0x1e8000,
 spiffs,   data, spiffs,  , 0x20000