diff --git a/platformio.ini b/platformio.ini
index c47c2ed13..c65179bb0 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -14,6 +14,7 @@ debug_flags =
   ; -D EMSESP_DEBUG
   ; -D EMSESP_UART_DEBUG
   ; -D EMSESP_FORCE_SERIAL
+  ; -D ENABLE_CORS
 
 ; default platformio compile flags are: -fno-rtti -std=c++11 -Os -mlongcalls -mtext-section-literals -falign-functions=4 -ffunction-sections -fdata-sections -fno-exceptions -Wall
 build_flags =
@@ -29,15 +30,12 @@ build_flags =
   -D ARDUINOJSON_ENABLE_STD_STRING=1
   -D PROGMEM_WWW
   -D CORS_ORIGIN=\"http://localhost:3000\"
-  ; Uncomment ENABLE_CORS to enable Cross-Origin Resource Sharing (required for local React development)
-  ; -D ENABLE_CORS
 
 [env]
 framework = arduino
 monitor_speed = 115200
-upload_speed = 921600 ; on OSX with non-native drivers use upload_speed = 115200
+upload_speed = 921600
 build_type = release
-
 lib_ldf_mode = chain+
 
 check_tool = cppcheck, clangtidy
@@ -54,7 +52,7 @@ extra_scripts =
 board = esp12e
 platform = espressif8266
 board_build.f_cpu = 160000000L
-build_flags = 
+build_flags = ${common.build_flags}
 
 [env:esp32]
 extra_scripts = 
@@ -63,7 +61,7 @@ extra_scripts =
 board = esp32dev
 platform = espressif32
 board_build.partitions = min_spiffs.csv 
-build_flags = 
+build_flags = ${common.build_flags}
 
 [env:esp8266-local]
 extra_scripts =