diff --git a/suite/auto-sync/Updater/CppTranslator/Configurator.py b/suite/auto-sync/Updater/CppTranslator/Configurator.py
index ed781c06b5..c032fd1097 100644
--- a/suite/auto-sync/Updater/CppTranslator/Configurator.py
+++ b/suite/auto-sync/Updater/CppTranslator/Configurator.py
@@ -68,13 +68,15 @@ def ts_compile_cpp(self) -> None:
         ts_grammar_path = get_path("{VENDOR_DIR}").joinpath("tree-sitter-cpp")
         if not Path.exists(ts_grammar_path):
             fail_exit(f"Could not load the tree-sitter grammar at '{ts_grammar_path}'")
-        Language.build_library(str(self.ts_shared_object), [ts_grammar_path])
+        # build_library wll be deprecated in 0.22.0. But CPP tree-sitter doesn't have Python bindings.
+        # So we stick with it.
+        Language.build_library(str(self.ts_shared_object), [str(ts_grammar_path)])
 
     def ts_set_cpp_language(self) -> None:
         log.info(f"Load language '{self.ts_shared_object}'")
         if not Path.exists(self.ts_shared_object):
             fail_exit(f"Could not load the tree-sitter language shared object at '{self.ts_shared_object}'")
-        self.ts_cpp_lang = Language(self.ts_shared_object, "cpp")
+        self.ts_cpp_lang = Language(str(self.ts_shared_object), "cpp")
 
     def init_parser(self) -> None:
         log.debug("Init parser")
diff --git a/suite/auto-sync/Updater/CppTranslator/CppTranslator.py b/suite/auto-sync/Updater/CppTranslator/CppTranslator.py
index 3a2465a99a..11a556cdfb 100755
--- a/suite/auto-sync/Updater/CppTranslator/CppTranslator.py
+++ b/suite/auto-sync/Updater/CppTranslator/CppTranslator.py
@@ -2,13 +2,11 @@
 from pathlib import Path
 
 import termcolor
-from tree_sitter import Language, Parser, Tree, Node
+from tree_sitter import Language, Parser, Tree, Node, Query
 import argparse
 import logging as log
 import sys
 
-from tree_sitter.binding import Query
-
 from CppTranslator.Configurator import Configurator
 from Helper import convert_loglevel, print_prominent_warning, get_header, run_clang_format, get_path
 from CppTranslator.Patches.GetRegFromClass import GetRegFromClass
diff --git a/suite/auto-sync/Updater/CppTranslator/TemplateCollector.py b/suite/auto-sync/Updater/CppTranslator/TemplateCollector.py
index 5f8451b572..c5fe8e2ae7 100644
--- a/suite/auto-sync/Updater/CppTranslator/TemplateCollector.py
+++ b/suite/auto-sync/Updater/CppTranslator/TemplateCollector.py
@@ -1,10 +1,9 @@
 import re
 from pathlib import Path
 
-from tree_sitter import Language, Parser
+from tree_sitter import Language, Parser, Query, Node
 import logging as log
 
-from tree_sitter.binding import Query, Node
 from CppTranslator.Patches.HelperMethods import get_text
 
 
diff --git a/suite/auto-sync/Updater/requirements.txt b/suite/auto-sync/Updater/requirements.txt
index a48c72c228..dd1326b486 100644
--- a/suite/auto-sync/Updater/requirements.txt
+++ b/suite/auto-sync/Updater/requirements.txt
@@ -1,2 +1,2 @@
 termcolor>=2.3.0
-tree_sitter>=0.20.2
+tree_sitter<0.22.0