diff --git a/code/build.sh b/code/build.sh
index 18d58766..5ebf5ace 100755
--- a/code/build.sh
+++ b/code/build.sh
@@ -34,8 +34,12 @@ if [ ${par_thread} -ge ${par_total_threads} ]; then
 fi
 
 # Available environments
-travis=$(grep env: platformio.ini | grep travis | sed 's/\[env://' | sed 's/\]/ /' | sort)
-available=$(grep env: platformio.ini | grep -v ota  | grep -v ssl  | grep -v travis | sed 's/\[env://' | sed 's/\]/ /' | sort)
+list_envs() {
+    grep env: platformio.ini | sed 's/\[env:\(.*\)\]/\1/g'
+}
+
+travis=$(list_envs | grep travis | sort)
+available=$(list_envs | grep -Ev -- '-ota$|-ssl$|^travis' | sort)
 
 # Build tools settings
 export PLATFORMIO_BUILD_FLAGS="${PLATFORMIO_BUILD_FLAGS} -DAPP_REVISION='\"$git_revision\"'"
diff --git a/code/platformio.ini b/code/platformio.ini
index 7802bd91..2c57785f 100644
--- a/code/platformio.ini
+++ b/code/platformio.ini
@@ -545,7 +545,7 @@ lib_ignore = ${common.lib_ignore}
 build_flags = ${common.build_flags_1m0m} -DITEAD_SONOFF_DUAL_R2
 extra_scripts = ${common.extra_scripts}
 
-[env:itead-sonoff-dual-ota-r2]
+[env:itead-sonoff-dual-r2-ota]
 platform = ${common.platform}
 framework = ${common.framework}
 board = ${common.board_1m}