diff --git a/CI/build/arduino-cli.py b/CI/build/arduino-cli.py
index 043f641b4e..e9af41cd99 100644
--- a/CI/build/arduino-cli.py
+++ b/CI/build/arduino-cli.py
@@ -53,7 +53,7 @@
 arch = arch_default
 arduino_platform = arduino_platform_default
 arduino_cli = ""
-arduino_cli_default_version = "0.10.0"
+arduino_cli_default_version = "0.17.0"
 arduino_cli_version = arduino_cli_default_version
 
 # List
@@ -462,6 +462,10 @@ def find_board():
     if args.board:
         arg_board_pattern = re.compile(args.board, re.IGNORECASE)
 
+    if version.parse(arduino_cli_version) >= version.parse("0.18.0"):
+        fqbn_key = "fqbn"
+    else:
+        fqbn_key = "FQBN"
     fqbn_list_tmp = []
     try:
         output = subprocess.check_output(
@@ -476,8 +480,8 @@ def find_board():
         boards_list = json.loads(output)
         if boards_list is not None:
             for board in boards_list["boards"]:
-                if arduino_platform in board["FQBN"]:
-                    fqbn_list_tmp.append(board["FQBN"])
+                if arduino_platform in board[fqbn_key]:
+                    fqbn_list_tmp.append(board[fqbn_key])
         if not len(fqbn_list_tmp):
             print("No boards found for " + arduino_platform)
             quit(1)
@@ -711,7 +715,7 @@ def genBasicCommand(b_name):
     cmd.append(build_output_cache_dir)
     if args.verbose:
         cmd.append("--verbose")
-    if version.parse(arduino_cli_version) <= version.parse(arduino_cli_default_version):
+    if version.parse(arduino_cli_version) <= version.parse("0.10.0"):
         cmd.append("--output")
         cmd.append(os.path.join(output_dir, b_name, bin_dir, "dummy_sketch"))
     else: