diff --git a/platformio.ini b/platformio.ini
index 6de5f5f55..12ccfcc90 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -133,7 +133,7 @@ build_flags                 = ${esp_defaults.build_flags}
                               -DBEARSSL_SSL_BASIC
                               ; NONOSDK22x_190703 = 2.2.2-dev(38a443e)
                               -DPIO_FRAMEWORK_ARDUINO_ESPRESSIF_SDK22x_190703
-                              -DPIO_FRAMEWORK_ARDUINO_LWIP2_IPV6_HIGHER_BANDWIDTH
+                              -DPIO_FRAMEWORK_ARDUINO_LWIP2_HIGHER_BANDWIDTH_LOW_FLASH
                               ; VTABLES in Flash
                               -DVTABLES_IN_FLASH
                               ; remove the 4-bytes alignment for PSTR()
diff --git a/tasmota/my_user_config.h b/tasmota/my_user_config.h
index b66d04a31..8cf0316f8 100644
--- a/tasmota/my_user_config.h
+++ b/tasmota/my_user_config.h
@@ -65,10 +65,10 @@
 #define BOOT_LOOP_OFFSET       1                 // [SetOption36] Number of boot loops before starting restoring defaults (0 = disable, 1..200 = boot loops offset)
 
 // -- Wifi ----------------------------------------
-#define WIFI_IPV4_ADDRESS      "0.0.0.0"         // [IpAddress1] Set to 0.0.0.0 for using DHCP or enter a static IP address
-#define WIFI_IPV4_GATEWAY      "192.168.1.1"     // [IpAddress2] If not using DHCP set Gateway IP address
-#define WIFI_IPV4_SUBNETMASK   "255.255.255.0"   // [IpAddress3] If not using DHCP set Network mask
-#define WIFI_IPV4_DNS          "192.168.1.1"     // [IpAddress4] If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY)
+#define WIFI_IP_ADDRESS        "0.0.0.0"         // [IpAddress1] Set to 0.0.0.0 for using DHCP or enter a static IP address
+#define WIFI_GATEWAY           "192.168.1.1"     // [IpAddress2] If not using DHCP set Gateway IP address
+#define WIFI_SUBNETMASK        "255.255.255.0"   // [IpAddress3] If not using DHCP set Network mask
+#define WIFI_DNS               "192.168.1.1"     // [IpAddress4] If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY)
 
 #define STA_SSID1              ""                // [Ssid1] Wifi SSID
 #define STA_PASS1              ""                // [Password1] Wifi password
diff --git a/tasmota/settings.ino b/tasmota/settings.ino
index 5421e7c8a..60c303452 100644
--- a/tasmota/settings.ino
+++ b/tasmota/settings.ino
@@ -812,10 +812,10 @@ void SettingsDefaultSet2(void)
   flag3.use_wifi_rescan |= WIFI_SCAN_REGULARLY;
   Settings.wifi_output_power = 170;
   Settings.param[P_ARP_GRATUITOUS] = WIFI_ARP_INTERVAL;
-  ParseIPv4(&Settings.ipv4_address[0], WIFI_IPV4_ADDRESS);
-  ParseIPv4(&Settings.ipv4_address[1], WIFI_IPV4_GATEWAY);
-  ParseIPv4(&Settings.ipv4_address[2], WIFI_IPV4_SUBNETMASK);
-  ParseIPv4(&Settings.ipv4_address[3], WIFI_IPV4_DNS);
+  ParseIPv4(&Settings.ipv4_address[0], WIFI_IP_ADDRESS);
+  ParseIPv4(&Settings.ipv4_address[1], WIFI_GATEWAY);
+  ParseIPv4(&Settings.ipv4_address[2], WIFI_SUBNETMASK);
+  ParseIPv4(&Settings.ipv4_address[3], WIFI_DNS);
   Settings.sta_config = WIFI_CONFIG_TOOL;
 //  Settings.sta_active = 0;
   SettingsUpdateText(SET_STASSID1, PSTR(STA_SSID1));
diff --git a/tasmota/user_config_override_sample.h b/tasmota/user_config_override_sample.h
index df151f9b2..cf5f27a25 100644
--- a/tasmota/user_config_override_sample.h
+++ b/tasmota/user_config_override_sample.h
@@ -68,18 +68,18 @@ Examples :
 // Ie:  export PLATFORMIO_BUILD_FLAGS='-DUSE_CONFIG_OVERRIDE -DMY_IP="192.168.1.99" -DMY_GW="192.168.1.1" -DMY_DNS="192.168.1.1"'
 
 #ifdef MY_IP
-#undef  WIFI_IPV4_ADDRESS
-#define WIFI_IPV4_ADDRESS   MY_IP                // Set to 0.0.0.0 for using DHCP or enter a static IP address
+#undef  WIFI_IP_ADDRESS
+#define WIFI_IP_ADDRESS     MY_IP                // Set to 0.0.0.0 for using DHCP or enter a static IP address
 #endif
 
 #ifdef MY_GW
-#undef  WIFI_IPV4_GATEWAY
-#define WIFI_IPV4_GATEWAY   MY_GW                // if not using DHCP set Gateway IP address
+#undef  WIFI_GATEWAY
+#define WIFI_GATEWAY        MY_GW                // if not using DHCP set Gateway IP address
 #endif
 
 #ifdef MY_DNS
-#undef  WIFI_IPV4_DNS
-#define WIFI_IPV4_DNS       MY_DNS               // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY)
+#undef  WIFI_DNS
+#define WIFI_DNS            MY_DNS               // If not using DHCP set DNS IP address (might be equal to WIFI_GATEWAY)
 #endif
 
 */