diff --git a/HISTORY.rst b/HISTORY.rst
index 8d21aea1..a96a8dfe 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -24,6 +24,7 @@ test-driven methodologies, and modern toolchains for unrivaled success.
 
 * Added support for Python 3.14
 * Upgraded the `Doctest <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/doctest.html>`__ testing framework to version 2.4.12, the `GoogleTest <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/doctest.html>`__ to version 1.17.0, and the `Unity <https://docs.platformio.org/en/latest/advanced/unit-testing/frameworks/unity.html>`__ to version 2.6.1, incorporating the latest features and improvements for enhanced testing capabilities
+* Enhanced compatibility with the CCLS language server, improving integration with editors like `Emacs <https://docs.platformio.org/en/latest/integration/ide/emacs.html>`__, `Sublime Text <https://docs.platformio.org/en/latest/integration/ide/sublimetext.html>`__, and `Vim <https://docs.platformio.org/en/latest/integration/ide/vim.html>`__ (`issue #5186 <https://github.com/platformio/platformio-core/issues/5186>`_)
 * Improved error messages for package installation to make it easier to understand when a package is missing or incompatible (`pull #5336 <https://github.com/platformio/platformio-core/pull/5336>`_).
 * Fixed a regression issue where custom build flags were not properly reflected in the `compile_commands.json <https://docs.platformio.org/en/latest/integration/compile_commands.html>`__ file, ensuring accurate compilation database generation
 * Fixed an issue where fully-qualified serial port URLs (e.g., ``rfc2217://host:port``) were incorrectly treated as wildcard patterns (`issue #5225 <https://github.com/platformio/platformio-core/issues/5225>`_)
diff --git a/platformio/project/integration/tpls/emacs/.ccls.tpl b/platformio/project/integration/tpls/emacs/.ccls.tpl
index 94d37680..236d30ca 100644
--- a/platformio/project/integration/tpls/emacs/.ccls.tpl
+++ b/platformio/project/integration/tpls/emacs/.ccls.tpl
@@ -1,6 +1,6 @@
 % from platformio.compat import shlex_join
 %
-clang
+{{ cc_path }}
 
 {{"%c"}} {{ shlex_join(cc_flags) }}
 {{"%cpp"}} {{ shlex_join(cxx_flags) }}
diff --git a/platformio/project/integration/tpls/sublimetext/.ccls.tpl b/platformio/project/integration/tpls/sublimetext/.ccls.tpl
index 94d37680..236d30ca 100644
--- a/platformio/project/integration/tpls/sublimetext/.ccls.tpl
+++ b/platformio/project/integration/tpls/sublimetext/.ccls.tpl
@@ -1,6 +1,6 @@
 % from platformio.compat import shlex_join
 %
-clang
+{{ cc_path }}
 
 {{"%c"}} {{ shlex_join(cc_flags) }}
 {{"%cpp"}} {{ shlex_join(cxx_flags) }}
diff --git a/platformio/project/integration/tpls/vim/.ccls.tpl b/platformio/project/integration/tpls/vim/.ccls.tpl
index 94d37680..236d30ca 100644
--- a/platformio/project/integration/tpls/vim/.ccls.tpl
+++ b/platformio/project/integration/tpls/vim/.ccls.tpl
@@ -1,6 +1,6 @@
 % from platformio.compat import shlex_join
 %
-clang
+{{ cc_path }}
 
 {{"%c"}} {{ shlex_join(cc_flags) }}
 {{"%cpp"}} {{ shlex_join(cxx_flags) }}