diff --git a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_16mb.csv b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_16mb.csv
index bb363392a1..4663f24ae1 100644
--- a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_16mb.csv
+++ b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_16mb.csv
@@ -7,10 +7,10 @@ nvs,      data, nvs,     0x9000,   0x6000,
 phy_init, data, phy,     0xf000,   0x1000,
 # Factory area for NanoCLR - 1536k
 factory,  0,    0,       0x10000,  0x180000,
-# Deployment area for Managed code 1769k
-deploy,   data, 0x84,    0x190000, 0xC70000, 
-# Config data for Network, Wireless, certificates, user data  2MB
-config,   data, spiffs,  0xE00000, 0x200000,
-##################################
-# total size has to be 0x1000000 #
-##################################
+# Deployment area for Managed code 3072K, Mapping issues with deployment areas over 3.5Mb, see issue #691
+deploy,   data, 0x84,    0x190000, 0x300000, 
+# Config data for Network, Wireless, certificates, user data  3MB
+config,   data, spiffs,  0x490000, 0x300000,
+##########################################
+# total size has to be 0x1000000 or less #
+##########################################
diff --git a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_8mb.csv b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_8mb.csv
index 1b87b8b90e..66ac2afb3a 100644
--- a/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_8mb.csv
+++ b/targets/FreeRTOS_ESP32/ESP32_WROOM_32/IDF/partitions_nanoclr_8mb.csv
@@ -7,10 +7,10 @@ nvs,      data, nvs,     0x9000,   0x6000,
 phy_init, data, phy,     0xf000,   0x1000,
 # Factory area for NanoCLR - 1536k
 factory,  0,    0,       0x10000,  0x180000,
-# Deployment area for Managed code 5568k
-deploy,   data, 0x84,    0x190000, 0x570000, 
-# Config data for Network, Wireless, certificates, user data  1Mb
-config,   data, spiffs,  0x700000, 0x100000,  
-#################################
-# total size has to be 0x800000 #
-#################################
+# Deployment area for Managed code 3072K, Mapping issues with deployment areas over 3.5Mb, see issue #691
+deploy,   data, 0x84,    0x190000, 0x300000, 
+# Config data for Network, Wireless, certificates, user data  2Mb
+config,   data, spiffs,  0x490000, 0x200000,  
+##########################################
+# total size has to be 0x800000 or less  #
+##########################################