diff --git a/ci/linux/install_arduino_cores.sh b/ci/linux/install_arduino_cores.sh
index 8fe9977..ff40048 100755
--- a/ci/linux/install_arduino_cores.sh
+++ b/ci/linux/install_arduino_cores.sh
@@ -6,11 +6,16 @@ cd "$(dirname "$0")"
 
 # Check Arduino CLI installation
 echo Expecting Arduino IDE installed in directory: $ARDUINO_CLI_INSTALL_DIR
-echo Searching for arduino cli executable...
+echo Searching for arduino-cli executable...
 export PATH=$PATH:$ARDUINO_CLI_INSTALL_DIR
 which arduino-cli
 echo
 
+echo Searching for yaml-merge executable...
+export PATH=$PATH:~/.local/bin
+which yaml-merge
+echo
+
 # Set arduino-cli config file path
 export ARDUINO_CONFIG_FILE_PATH="/home/$USER/.arduino15/arduino-cli.yaml"
 echo ARDUINO_CONFIG_FILE_PATH set to '$ARDUINO_CONFIG_FILE_PATH'
@@ -20,14 +25,14 @@ echo
 
 export YAML_MERGE_FILE="../arduinocli-core-esp8266.yaml"
 echo Adding $YAML_MERGE_FILE to arduino-cli config...
-yaml-merge --nostdin '$YAML_MERGE_FILE' '$ARDUINO_CONFIG_FILE_PATH' --overwrite='$ARDUINO_CONFIG_FILE_PATH'
+yaml-merge --nostdin "$YAML_MERGE_FILE" "$ARDUINO_CONFIG_FILE_PATH" --overwrite="$ARDUINO_CONFIG_FILE_PATH"
 cat "$ARDUINO_CONFIG_FILE_PATH"
 echo
 echo
 
-set YAML_MERGE_FILE="../arduinocli-core-esp32.yaml"
+export YAML_MERGE_FILE="../arduinocli-core-esp32.yaml"
 echo Adding $YAML_MERGE_FILE to arduino-cli config...
-yaml-merge --nostdin '$YAML_MERGE_FILE' '$ARDUINO_CONFIG_FILE_PATH' --overwrite='$ARDUINO_CONFIG_FILE_PATH'
+yaml-merge --nostdin "$YAML_MERGE_FILE" "$ARDUINO_CONFIG_FILE_PATH" --overwrite="$ARDUINO_CONFIG_FILE_PATH"
 cat "$ARDUINO_CONFIG_FILE_PATH"
 echo
 echo
diff --git a/ci/windows/install_arduino_cores.bat b/ci/windows/install_arduino_cores.bat
index e75e163..7ca64fc 100644
--- a/ci/windows/install_arduino_cores.bat
+++ b/ci/windows/install_arduino_cores.bat
@@ -5,12 +5,17 @@ cd /d %~dp0
 
 :: Check Arduino CLI installation
 echo Expecting Arduino CLI installed in directory: %ARDUINO_CLI_INSTALL_DIR%
-echo Searching for arduino cli executable...
+echo Searching for arduino-cli executable...
 set PATH=%PATH%;%ARDUINO_CLI_INSTALL_DIR%
 where arduino-cli.exe
 if %errorlevel% neq 0 exit /b %errorlevel%
 echo.
 
+echo Searching for yaml-merge executable...
+where yaml-merge
+if %errorlevel% neq 0 exit /b %errorlevel%
+echo.
+
 :: Set arduino-cli config file path
 set ARDUINO_CONFIG_FILE_PATH=C:\Users\%USERNAME%\AppData\Local\Arduino15\arduino-cli.yaml
 echo ARDUINO_CONFIG_FILE_PATH set to '%ARDUINO_CONFIG_FILE_PATH%'