diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 06f37b0a2..c6bd6ba4a 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -147,6 +147,12 @@ accepted:
  dependencies, they must be available as packages in [Debian OldStable](https://wiki.debian.org/DebianOldStable).
  * Write tests.
  * Follow our [coding style guide](https://gnss-sdr.org/coding-style/).
+ Specifically, please make sure that you have applied
+ [clang-format](https://clang.llvm.org/docs/ClangFormat.html) and
+ [clang-tidy](https://clang.llvm.org/extra/clang-tidy/) to your changes before
+ you do your pull request. Please check the
+ [final recommendations](https://gnss-sdr.org/coding-style/#final-recommendations)
+ for guidelines on how to apply those tools.
  * Write a descriptive and detailed summary. Please consider that
 reviewing pull requests is hard, so include as much information as
 possible to make your pull request's intent clear.
diff --git a/docs/PULL_REQUEST_TEMPLATE.md b/docs/PULL_REQUEST_TEMPLATE.md
index a6cc9eef2..0ee821802 100644
--- a/docs/PULL_REQUEST_TEMPLATE.md
+++ b/docs/PULL_REQUEST_TEMPLATE.md
@@ -4,9 +4,8 @@ Before submitting your pull request, please make sure the following is done:
  1. You undertake the [Contributor Covenant Code of Conduct](https://github.com/gnss-sdr/gnss-sdr/blob/master/CODE_OF_CONDUCT.md).
  2. If you are a first-time contributor, after your pull request you will be asked to sign an Individual Contributor License Agreement ([CLA](https://en.wikipedia.org/wiki/Contributor_License_Agreement)) before your code gets accepted into `master`. This license is for your protection as a Contributor as well as for the protection of [CTTC](http://www.cttc.es/); it does not change your rights to use your own contributions for any other purpose. Except for the license granted therein to CTTC and recipients of software distributed by CTTC, you reserve all right, title, and interest in and to your contributions. The information you provide in that CLA will be maintained in accordance with [CTTC's privacy policy](http://www.cttc.es/privacy/).
  3. You have read the [Contributing Guidelines](https://github.com/gnss-sdr/gnss-sdr/blob/master/CONTRIBUTING.md).
- 4. You have read the [coding style guide](https://gnss-sdr.org/coding-style/).
- 5. Specifically, you have read [about clang-format](https://gnss-sdr.org/coding-style/#use-tools-for-automated-code-formatting) and you have applied it.
- 6. You have forked the [gnss-sdr upstream repository](https://github.com/gnss-sdr/gnss-sdr) and have created your branch from `next` (or any other currently living branch in the upstream repository).
- 7. Please include a description of your changes here.
+ 4. You have read the [coding style guide](https://gnss-sdr.org/coding-style/). Specifically, you have read [about clang-format](https://gnss-sdr.org/coding-style/#use-tools-for-automated-code-formatting) and [about clang-tidy](https://gnss-sdr.org/coding-style/#use-code-linters), and you have applied those tools to your changes.
+ 5. You have forked the [gnss-sdr upstream repository](https://github.com/gnss-sdr/gnss-sdr) and have created your branch from `next` (or any other currently living branch in the upstream repository).
+ 6. Please include a description of your changes here.
 
 **Please feel free to delete this line and the above text once you have read it and in case you want to go on with your pull request, and explain your intend below.**