diff --git a/components/partition_table/gen_esp32part.py b/components/partition_table/gen_esp32part.py
index cb6a5f24a1..5ead13adc7 100755
--- a/components/partition_table/gen_esp32part.py
+++ b/components/partition_table/gen_esp32part.py
@@ -116,7 +116,8 @@ class PartitionDefinition(object):
         "app" : APP_TYPE,
         "data" : DATA_TYPE,
     }
-
+    
+    # Keep this map in sync with esp_partition_subtype_t enum in esp_partition.h 
     SUBTYPES = {
         APP_TYPE : {
             "factory" : 0x00,
@@ -124,8 +125,11 @@ class PartitionDefinition(object):
             },
         DATA_TYPE : {
             "ota" : 0x00,
-            "rf" : 0x01,
-            "wifi" : 0x02,
+            "phy" : 0x01,
+            "nvs" : 0x02,
+            "esphttpd" : 0x80,
+            "fat" : 0x81,
+            "spiffs" : 0x82,
             },
     }
 
diff --git a/components/partition_table/partitions_singleapp.csv b/components/partition_table/partitions_singleapp.csv
index 940b8a76c4..8517b1196f 100644
--- a/components/partition_table/partitions_singleapp.csv
+++ b/components/partition_table/partitions_singleapp.csv
@@ -1,4 +1,4 @@
 # Name,   Type, SubType, Offset,  Size
+nvs,      data, nvs,     0x9000,  0x6000
+phy_init, data, phy,     0xf000,  0x1000
 factory,  app,  factory, 0x10000, 1M
-rfdata,	  data, rf,      ,        256K
-wifidata, data, wifi,    ,        256K
diff --git a/components/partition_table/partitions_two_ota.csv b/components/partition_table/partitions_two_ota.csv
index 8e064e14b2..58c1127d8c 100644
--- a/components/partition_table/partitions_two_ota.csv
+++ b/components/partition_table/partitions_two_ota.csv
@@ -1,7 +1,7 @@
 # Name,   Type, SubType, Offset,   Size
+nvs,      data, nvs,     0x9000,  0x4000
+otadata,  data, ota,     0xd000,  0x2000
+phy_init, data, phy,     0xf000,  0x1000
 factory,  0,    0,       0x10000,  1M
 ota_0,    0,    ota_0,   ,         1M
 ota_1,    0,    ota_1,   ,         1M
-rfdata,   data, rf,      ,         256K
-wifidata, data, wifi,    ,         256K
-otadata,  data, ota,     ,         256K