diff --git a/user_setups/esp32/partitions_16MB.csv b/user_setups/esp32/partitions_16MB.csv
index 45bb999d..ddff6cdb 100644
--- a/user_setups/esp32/partitions_16MB.csv
+++ b/user_setups/esp32/partitions_16MB.csv
@@ -4,6 +4,8 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,   20K,
 otadata,  data, ota,     56K,   8K,
-app0,     app,  ota_0,   64K,   2048K,
-app1,     app,  ota_1,   2112K, 2048K,
+app0,     app,  ota_0,   64K,   1984K,
+app1,     app,  ota_1,   2048K, 1984K,
+device,   data, nvs,     4032K, 64K,
+config,   data, nvs,     4096K, 64K,
 spiffs,   data, spiffs,  4160K, 12224K,
diff --git a/user_setups/esp32/partitions_2MB.csv b/user_setups/esp32/partitions_2MB.csv
index 19840001..441aa8b5 100644
--- a/user_setups/esp32/partitions_2MB.csv
+++ b/user_setups/esp32/partitions_2MB.csv
@@ -1,8 +1,9 @@
 # One single application partition of 1.625 MB
-# 320 kB filesystem
+# 240 kB filesystem
 #
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,     20K,
 otadata,  data, ota,     56K,     8K,
-app0,     app,  ota_0,   64K,     1664K,
-spiffs,   data, spiffs,  1728K,   320K,
+app0,     app,  ota_0,   64K,     1728K,
+user,     data, nvs,     1792K,   16K,
+spiffs,   data, spiffs,  1808K,   240K,
diff --git a/user_setups/esp32/partitions_32MB.csv b/user_setups/esp32/partitions_32MB.csv
index d3cfde77..3131c365 100644
--- a/user_setups/esp32/partitions_32MB.csv
+++ b/user_setups/esp32/partitions_32MB.csv
@@ -4,6 +4,8 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,   20K,
 otadata,  data, ota,     56K,   8K,
-app0,     app,  ota_0,   64K,   2048K,
-app1,     app,  ota_1,   2112K, 2048K,
+app0,     app,  ota_0,   64K,   1984K,
+app1,     app,  ota_1,   2048K, 1984K,
+device,   data, nvs,     4032K, 64K,
+config,   data, nvs,     4096K, 64K,
 spiffs,   data, spiffs,  4160K, 28608K,
diff --git a/user_setups/esp32/partitions_4MB.csv b/user_setups/esp32/partitions_4MB.csv
index 733ff0c5..7ebef6aa 100644
--- a/user_setups/esp32/partitions_4MB.csv
+++ b/user_setups/esp32/partitions_4MB.csv
@@ -1,9 +1,10 @@
-# Two application partitions of 1664 kB
-# 704 kB filesystem
+# Two application partitions of 1.687 MB
+# 560 kB filesystem
 #
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,     20K,
 otadata,  data, ota,     56K,     8K,
-app0,     app,  ota_0,   64K,     1664K,
-app1,     app,  ota_1,   1728K,   1664K,
-spiffs,   data, spiffs,  3392K,   704K,
+app0,     app,  ota_0,   64K,     1728K,
+app1,     app,  ota_1,   1792K,   1728K,
+config,   data, nvs,     3520K,   16K,
+spiffs,   data, spiffs,  3536K,   560K,
diff --git a/user_setups/esp32/partitions_8MB.csv b/user_setups/esp32/partitions_8MB.csv
index 741b8fb2..47cb4dd3 100644
--- a/user_setups/esp32/partitions_8MB.csv
+++ b/user_setups/esp32/partitions_8MB.csv
@@ -4,6 +4,8 @@
 # Name,   Type, SubType, Offset,  Size, Flags
 nvs,      data, nvs,     36K,   20K,
 otadata,  data, ota,     56K,   8K,
-app0,     app,  ota_0,   64K,   2048K,
-app1,     app,  ota_1,   2112K, 2048K,
+app0,     app,  ota_0,   64K,   1984K,
+app1,     app,  ota_1,   2048K, 1984K,
+device,   data, nvs,     4032K, 64K,
+config,   data, nvs,     4096K, 64K,
 spiffs,   data, spiffs,  4160K, 4032K,