diff --git a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
index 84672bb62..5e524894d 100644
--- a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2S.cpp
@@ -22,7 +22,11 @@
 #ifdef ESP32
   #include "driver/i2s.h"
 #elif defined(ARDUINO_ARCH_RP2040) || defined(ESP8266)
-  #include <i2s.h>
+  #ifdef ARDUINO_ESP8266_MAJOR    //this define was added in ESP8266 Arduino Core version v3.0.1
+    #include "core_esp8266_i2s.h" //for Arduino core >= 3.0.1
+  #else
+    #include "i2s.h"              //for Arduino core <= 3.0.0
+  #endif
 #endif
 #include "AudioOutputI2S.h"
 
diff --git a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
index 65c639e01..116d9ac74 100644
--- a/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
+++ b/lib/lib_audio/ESP8266Audio/src/AudioOutputI2SNoDAC.cpp
@@ -22,7 +22,11 @@
 #ifdef ESP32
   #include "driver/i2s.h"
 #elif defined(ARDUINO_ARCH_RP2040) || defined(ESP8266)
-  #include <i2s.h>
+  #ifdef ARDUINO_ESP8266_MAJOR    //this define was added in ESP8266 Arduino Core version v3.0.1
+    #include "core_esp8266_i2s.h" //for Arduino core >= 3.0.1
+  #else
+    #include "i2s.h"              //for Arduino core <= 3.0.0
+  #endif
 #endif
 #include "AudioOutputI2SNoDAC.h"
 
diff --git a/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp8266DmaMethod.h b/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp8266DmaMethod.h
index 103215655..153d29755 100644
--- a/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp8266DmaMethod.h
+++ b/lib/lib_basic/NeoPixelBus/src/internal/NeoEsp8266DmaMethod.h
@@ -37,13 +37,13 @@ extern "C"
 #include "Arduino.h"
 #include "osapi.h"
 #include "ets_sys.h"
-
 #include "i2s_reg.h"
-#ifndef ARDUINO_ESP8266_RELEASE_3_0_1
-#include "i2s.h"
-#else 
-#include "core_esp8266_i2s.h"
+#ifdef ARDUINO_ESP8266_MAJOR    //this define was added in ESP8266 Arduino Core version v3.0.1
+  #include "core_esp8266_i2s.h" //for Arduino core >= 3.0.1
+#else
+  #include "i2s.h"              //for Arduino core <= 3.0.0
 #endif
+
 #include "eagle_soc.h"
 #include "esp8266_peri.h"
 #include "slc_register.h"
diff --git a/platformio_tasmota_cenv_sample.ini b/platformio_tasmota_cenv_sample.ini
index 7e79e50e2..56834c6b2 100644
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@@ -6,8 +6,8 @@
 ;build_flags                 = ${core_dev.build_flags}
 
 [core_dev]
-; *** Esp8266 core for Arduino 3.0.1
-platform                    = espressif8266 @ 3.1.0
+; *** Esp8266 core for Arduino 3.0.2
+platform                    = https://github.com/platformio/platform-espressif8266.git
 platform_packages           =
 build_unflags               = ${esp_defaults.build_unflags}
                               -Wswitch-unreachable