diff --git a/components/mqtt/esp-mqtt b/components/mqtt/esp-mqtt
index 89e5c60..ae53d79 160000
--- a/components/mqtt/esp-mqtt
+++ b/components/mqtt/esp-mqtt
@@ -1 +1 @@
-Subproject commit 89e5c6014f8dbcfcd98af35fb507ca7b96ac8aee
+Subproject commit ae53d799da294f03ef65c33e88fa33648e638134
diff --git a/components/mqtt/host_test/main/test_mqtt_client.cpp b/components/mqtt/host_test/main/test_mqtt_client.cpp
index e0c0160..4979c19 100644
--- a/components/mqtt/host_test/main/test_mqtt_client.cpp
+++ b/components/mqtt/host_test/main/test_mqtt_client.cpp
@@ -95,7 +95,7 @@ TEST_CASE_METHOD(ClientInitializedFixture, "Client Start")
 {
     SECTION("Successful start") {
         esp_mqtt_client_config_t config{};
-        config.uri = "mqtt://1.1.1.1";
+        config.broker.address.uri = "mqtt://1.1.1.1";
         struct http_parser_url ret_uri = {
             .field_set = 1 | (1<<1),
             .port = 0,
diff --git a/components/mqtt/test/test_mqtt.c b/components/mqtt/test/test_mqtt.c
index 7a0f938..2494d03 100644
--- a/components/mqtt/test/test_mqtt.c
+++ b/components/mqtt/test/test_mqtt.c
@@ -38,7 +38,7 @@ TEST_CASE("mqtt init with invalid url", "[mqtt][leaks=0]")
 {
     test_leak_setup(__FILE__, __LINE__);
     const esp_mqtt_client_config_t mqtt_cfg = {
-            .uri = "INVALID",
+            .broker.address.uri = "INVALID",
     };
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
     TEST_ASSERT_EQUAL(NULL, client );
@@ -49,7 +49,7 @@ TEST_CASE("mqtt init and deinit", "[mqtt][leaks=0]")
     test_leak_setup(__FILE__, __LINE__);
     const esp_mqtt_client_config_t mqtt_cfg = {
             // no connection takes place, but the uri has to be valid for init() to succeed
-            .uri = "mqtts://localhost:8883",
+            .broker.address.uri = "mqtts://localhost:8883",
     };
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
     TEST_ASSERT_NOT_EQUAL(NULL, client );
@@ -73,7 +73,7 @@ TEST_CASE("mqtt enqueue and destroy outbox", "[mqtt][leaks=0]")
     const int size = 2000;
     const esp_mqtt_client_config_t mqtt_cfg = {
             // no connection takes place, but the uri has to be valid for init() to succeed
-            .uri = "mqtts://localhost:8883",
+            .broker.address.uri = "mqtts://localhost:8883",
     };
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
     TEST_ASSERT_NOT_EQUAL(NULL, client );
diff --git a/components/mqtt/test/test_mqtt_client_broker.c b/components/mqtt/test/test_mqtt_client_broker.c
index cb0f3ae..05fca43 100644
--- a/components/mqtt/test/test_mqtt_client_broker.c
+++ b/components/mqtt/test/test_mqtt_client_broker.c
@@ -101,8 +101,8 @@ static void mqtt_event_handler(void *handler_args, esp_event_base_t base, int32_
 bool mqtt_connect_disconnect(void)
 {
     const esp_mqtt_client_config_t mqtt_cfg = {
-            .uri = CONFIG_MQTT_TEST_BROKER_URI,
-            .disable_auto_reconnect = true,
+            .broker.address.uri = CONFIG_MQTT_TEST_BROKER_URI,
+            .network.disable_auto_reconnect = true,
     };
     s_event_group = xEventGroupCreate();
     esp_mqtt_client_handle_t client = esp_mqtt_client_init(&mqtt_cfg);
@@ -122,7 +122,7 @@ bool mqtt_connect_disconnect(void)
 bool mqtt_subscribe_publish(void)
 {
     const esp_mqtt_client_config_t mqtt_cfg = {
-            .uri = CONFIG_MQTT_TEST_BROKER_URI,
+            .broker.address.uri = CONFIG_MQTT_TEST_BROKER_URI,
     };
     char* topic = append_mac("topic");
     TEST_ASSERT_TRUE(NULL != topic);
@@ -152,16 +152,16 @@ bool mqtt_lwt_clean_disconnect(void)
     char* lwt = append_mac("lwt");
     TEST_ASSERT_TRUE(lwt);
     const esp_mqtt_client_config_t mqtt_cfg1 = {
-            .uri = CONFIG_MQTT_TEST_BROKER_URI,
-            .set_null_client_id = true,
-            .lwt_topic = lwt,
-            .lwt_msg = "lwt_msg"
+            .broker.address.uri = CONFIG_MQTT_TEST_BROKER_URI,
+            .credentials.set_null_client_id = true,
+            .session.last_will.topic = lwt,
+            .session.last_will.msg = "lwt_msg"
     };
     const esp_mqtt_client_config_t mqtt_cfg2 = {
-            .uri = CONFIG_MQTT_TEST_BROKER_URI,
-            .set_null_client_id = true,
-            .lwt_topic = lwt,
-            .lwt_msg = "lwt_msg"
+            .broker.address.uri = CONFIG_MQTT_TEST_BROKER_URI,
+            .credentials.set_null_client_id = true,
+            .session.last_will.topic = lwt,
+            .session.last_will.msg = "lwt_msg"
     };
     s_event_group = xEventGroupCreate();
 
@@ -201,8 +201,8 @@ bool mqtt_lwt_clean_disconnect(void)
 bool mqtt_subscribe_payload(void)
 {
     const esp_mqtt_client_config_t mqtt_cfg = {
-            .uri = CONFIG_MQTT_TEST_BROKER_URI,
-            .disable_auto_reconnect = true,
+            .broker.address.uri = CONFIG_MQTT_TEST_BROKER_URI,
+            .network.disable_auto_reconnect = true,
     };
     char* topic = append_mac("topic");
     TEST_ASSERT_TRUE(NULL != topic);