diff --git a/platformio.ini b/platformio.ini
index 3a77eb1a1..9344e7254 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -35,10 +35,8 @@ custom_unpack_dir           = unpacked_littlefs
 build_unflags               = ${core.build_unflags}
 build_flags                 = ${core.build_flags}
 monitor_speed               = 115200
-monitor_port                = COM5
 ; *** Upload Serial reset method for Wemos and NodeMCU
 upload_resetmethod          = nodemcu
-upload_port                 = COM5
 extra_scripts               = ${esp_defaults.extra_scripts}
 lib_ldf_mode                = chain
 lib_compat_mode             = strict
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index 3dcff4fae..572a595a0 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -70,9 +70,9 @@ board                   = ${common.board}
 ;board                   = esp8266_4M2M
 ;board_build.f_cpu       = 160000000L
 ;board_build.f_flash     = 40000000L
-;monitor_speed           = 115200
-; *** Serial port used for erasing/flashing the ESP82xx
-;upload_port             = COM5
+; *** Define serial port used for erasing/flashing/terminal
+;upload_port             = COM4
+;monitor_port            = COM4
 extra_scripts           = ${esp_defaults.extra_scripts}
 ;                          pio-tools/obj-dump.py
 lib_ignore              =
@@ -111,11 +111,11 @@ lib_extra_dirs          = ${library.lib_extra_dirs}
 ;board_upload.maximum_size = 8388608
 ;board_upload.arduino.flash_extra_images =
 ;board_build.partitions  = partitions/esp32_partition_app2944k_fs2M.csv
-monitor_speed           = 115200
 ; *** Serial port used for erasing/flashing the ESP32
-;upload_port             = ${common.upload_port}
-upload_port             = COM4
+;upload_port             = COM4
+;monitor_port            = COM4
 ;upload_speed            = 115200
+monitor_speed           = 115200
 upload_resetmethod      = ${common.upload_resetmethod}
 extra_scripts           = ${esp32_defaults.extra_scripts}
 ;                          pio-tools/obj-dump.py
diff --git a/platformio_tasmota_env.ini b/platformio_tasmota_env.ini
index 65a5490c7..bce085213 100644
--- a/platformio_tasmota_env.ini
+++ b/platformio_tasmota_env.ini
@@ -7,7 +7,6 @@ board_build.filesystem      = ${common.board_build.filesystem}
 build_unflags               = ${common.build_unflags}
 build_flags                 = ${common.build_flags}
 monitor_speed               = ${common.monitor_speed}
-upload_port                 = ${common.upload_port}
 upload_resetmethod          = ${common.upload_resetmethod}
 extra_scripts               = ${common.extra_scripts}
 lib_ldf_mode                = ${common.lib_ldf_mode}
diff --git a/platformio_tasmota_env32.ini b/platformio_tasmota_env32.ini
index 8acfebe40..d68554e80 100644
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@@ -6,7 +6,6 @@ board_build.filesystem      = ${common.board_build.filesystem}
 custom_unpack_dir           = ${common.custom_unpack_dir}
 board                       = esp32
 monitor_speed               = 115200
-upload_port                 = ${common.upload_port}
 upload_resetmethod          = ${common.upload_resetmethod}
 extra_scripts               = ${esp32_defaults.extra_scripts}
 build_unflags               = ${core32.build_unflags}