diff --git a/examples/Azure_IoT_Central_ESP32/AzureIoT.cpp b/examples/Azure_IoT_Central_ESP32/AzureIoT.cpp
index 782dd684..c2d189b2 100644
--- a/examples/Azure_IoT_Central_ESP32/AzureIoT.cpp
+++ b/examples/Azure_IoT_Central_ESP32/AzureIoT.cpp
@@ -22,12 +22,12 @@ log_function_t default_logging_function = NULL;
 #define DPS_GLOBAL_ENDPOINT_MQTT_URI_WITH_PORT      DPS_GLOBAL_ENDPOINT_MQTT_URI ":" STR(DPS_GLOBAL_ENDPOINT_PORT)
 
 #define MQTT_CLIENT_ID_BUFFER_SIZE                  256
-#define MQTT_USERNAME_BUFFER_SIZE                   256
+#define MQTT_USERNAME_BUFFER_SIZE                   350
 #define DECODED_SAS_KEY_BUFFER_SIZE                 32
 #define PLAIN_SAS_SIGNATURE_BUFFER_SIZE             256
 #define SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE 32
 #define SAS_SIGNATURE_BUFFER_SIZE                   64
-#define MQTT_PASSWORD_BUFFER_SIZE                   256
+#define MQTT_PASSWORD_BUFFER_SIZE                   512
 
 #define DPS_REGISTER_CUSTOM_PAYLOAD_BEGIN           "{\"modelId\":\""
 #define DPS_REGISTER_CUSTOM_PAYLOAD_END             "\"}"
diff --git a/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino b/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino
index becd292b..47faa16c 100644
--- a/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino
+++ b/examples/Azure_IoT_Central_ESP32/Azure_IoT_Central_ESP32.ino
@@ -96,7 +96,7 @@ static esp_mqtt_client_handle_t mqtt_client;
 
 static char mqtt_broker_uri[128];
 
-#define AZ_IOT_DATA_BUFFER_SIZE 1000 
+#define AZ_IOT_DATA_BUFFER_SIZE 1500
 static uint8_t az_iot_data_buffer[AZ_IOT_DATA_BUFFER_SIZE];
 
 #define MQTT_PROTOCOL_PREFIX "mqtts://"
diff --git a/examples/Azure_IoT_Central_ESP32_AzureIoTKit/AzureIoT.cpp b/examples/Azure_IoT_Central_ESP32_AzureIoTKit/AzureIoT.cpp
index 782dd684..c2d189b2 100644
--- a/examples/Azure_IoT_Central_ESP32_AzureIoTKit/AzureIoT.cpp
+++ b/examples/Azure_IoT_Central_ESP32_AzureIoTKit/AzureIoT.cpp
@@ -22,12 +22,12 @@ log_function_t default_logging_function = NULL;
 #define DPS_GLOBAL_ENDPOINT_MQTT_URI_WITH_PORT      DPS_GLOBAL_ENDPOINT_MQTT_URI ":" STR(DPS_GLOBAL_ENDPOINT_PORT)
 
 #define MQTT_CLIENT_ID_BUFFER_SIZE                  256
-#define MQTT_USERNAME_BUFFER_SIZE                   256
+#define MQTT_USERNAME_BUFFER_SIZE                   350
 #define DECODED_SAS_KEY_BUFFER_SIZE                 32
 #define PLAIN_SAS_SIGNATURE_BUFFER_SIZE             256
 #define SAS_HMAC256_ENCRIPTED_SIGNATURE_BUFFER_SIZE 32
 #define SAS_SIGNATURE_BUFFER_SIZE                   64
-#define MQTT_PASSWORD_BUFFER_SIZE                   256
+#define MQTT_PASSWORD_BUFFER_SIZE                   512
 
 #define DPS_REGISTER_CUSTOM_PAYLOAD_BEGIN           "{\"modelId\":\""
 #define DPS_REGISTER_CUSTOM_PAYLOAD_END             "\"}"
diff --git a/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino b/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino
index a20adcf0..b77bc615 100644
--- a/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino
+++ b/examples/Azure_IoT_Central_ESP32_AzureIoTKit/Azure_IoT_Central_ESP32_AzureIoTKit.ino
@@ -102,7 +102,7 @@ static esp_mqtt_client_handle_t mqtt_client;
 
 static char mqtt_broker_uri[128];
 
-#define AZ_IOT_DATA_BUFFER_SIZE 1000 
+#define AZ_IOT_DATA_BUFFER_SIZE 1500
 static uint8_t az_iot_data_buffer[AZ_IOT_DATA_BUFFER_SIZE];
 
 #define MQTT_PROTOCOL_PREFIX "mqtts://"