diff --git a/components/esp_wifi/Kconfig b/components/esp_wifi/Kconfig
index 96ab678d40..9becd30ba2 100644
--- a/components/esp_wifi/Kconfig
+++ b/components/esp_wifi/Kconfig
@@ -574,6 +574,7 @@ menu "Wi-Fi"
             bool "WiFi Aware"
             default n
             depends on SOC_WIFI_NAN_SUPPORT
+            select LWIP_IPV6
             help
                 Enable WiFi Aware (NAN) feature.
 
diff --git a/components/esp_wifi/test_apps/bin_size_apsta/pytest_bin_size_apsta.py b/components/esp_wifi/test_apps/bin_size_apsta/pytest_bin_size_apsta.py
index 56b556ebdd..a014517091 100644
--- a/components/esp_wifi/test_apps/bin_size_apsta/pytest_bin_size_apsta.py
+++ b/components/esp_wifi/test_apps/bin_size_apsta/pytest_bin_size_apsta.py
@@ -23,8 +23,8 @@ SAVE_BIN_SIZE_TH = {
     },
     'disable_nan': {
         'esp32': 29600,
-        'esp32c5': 32400,
-        'esp32c61': 32400,
+        'esp32c5': 32000,
+        'esp32c61': 32000,
         'esp32s2': 28000,
         # other chips does not support nan
         'default': 0,
diff --git a/examples/protocols/mqtt/ssl_ds/sdkconfig.defaults b/examples/protocols/mqtt/ssl_ds/sdkconfig.defaults
index 94e282f1d6..48a8a9ebde 100644
--- a/examples/protocols/mqtt/ssl_ds/sdkconfig.defaults
+++ b/examples/protocols/mqtt/ssl_ds/sdkconfig.defaults
@@ -5,3 +5,4 @@ CONFIG_PARTITION_TABLE_CUSTOM=y
 # uses this offset for `esp_secure_cert` and hence this change aligns this example
 # to work on those modules.
 CONFIG_PARTITION_TABLE_OFFSET=0xC000
+CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
diff --git a/examples/wifi/wifi_aware/nan_subscriber/main/subscriber_main.c b/examples/wifi/wifi_aware/nan_subscriber/main/subscriber_main.c
index e7038c7f71..845042802b 100644
--- a/examples/wifi/wifi_aware/nan_subscriber/main/subscriber_main.c
+++ b/examples/wifi/wifi_aware/nan_subscriber/main/subscriber_main.c
@@ -31,6 +31,9 @@
 #else
 #define EXAMPLE_NAN_SVC_MSG             "Hello"
 #endif
+#ifndef ETH_ALEN
+#define ETH_ALEN 6
+#endif
 
 static const char *TAG = "subscriber";