diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 443f9d21d84057a57286901cd140db76dd46699a..371615b4a54461f3789ceca7e2f8e7537cdbe39d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,10 @@
 ---
+include:
+  - project: shore/ci-templates
+    file: templates/pre-commit.yml
+
 build:
+  stage: deploy
   tags: ["host01.shore.co.il"]
   only: ["nimrod"]
   script:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..3fc40596d0ee7e72728c8d38f5259536d6373723
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,34 @@
+---
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v3.4.0
+    hooks:
+      - id: check-merge-conflict
+      - id: trailing-whitespace
+
+  - repo: https://github.com/Yelp/detect-secrets
+    rev: v0.14.3
+    hooks:
+      - id: detect-secrets
+
+  - repo: https://github.com/adrienverge/yamllint
+    rev: v1.25.0
+    hooks:
+      - id: yamllint
+
+  - repo: https://github.com/amperser/proselint/
+    rev: 0.10.2
+    hooks:
+      - id: proselint
+        types: [plain-text]
+        exclude: LICENSE|README
+
+  - repo: https://github.com/Lucas-C/pre-commit-hooks-markup
+    rev: v1.0.1
+    hooks:
+      - id: rst-linter
+
+  - repo: https://github.com/myint/rstcheck.git
+    rev: master
+    hooks:
+      - id: rstcheck
diff --git a/README.rst b/README.rst
index c9d44c7beb1b7a2d6821bf53774cf4d8c282d52e..650ab9e18c6daeec21085bbdcc52d411a239ed5f 100644
--- a/README.rst
+++ b/README.rst
@@ -1,10 +1,10 @@
-Resume generator
+Résumé generator
 ================
 
-A (very) little framework to generate your resume from whatever markup that
+A tiny framework to generate your résumé from whatever markup that
 suits you (and that Pandoc can read).
 
-My own resume is in the :code:`nimrod` branch, the outputed files can be found
+My own résumé is in the :code:`nimrod` branch, the outputed files can be found
 in my `about me <https://www.shore.co.il/blog/pages/about-me.html>`_ page.
 
 Dependencies
@@ -40,7 +40,7 @@ To upload to webserver (includes rebuilding all versions)
 License
 -------
 
-This repository is licensed under the `Creative Commons 
+This repository is licensed under the `Creative Commons
 Attribution 4.0 International (CC BY 4.0) license
 <http://creativecommons.org/licenses/by/4.0/>`_ (see :code:`LICENSE.txt`)