diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 1e4e3659d0..603aad6e6a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,7 +1,14 @@
 repos:
   -   repo: https://github.com/pre-commit/pre-commit-hooks
-      rev: v4.6.0
+      rev: v5.0.0
       hooks:
+        -   id: check-illegal-windows-names
+        -   id: check-json
+            exclude: |
+              (?x)^(
+                spec/fixtures/files/.*
+              )$
+        -   id: check-merge-conflict
         -   id: check-yaml
             exclude: |
               (?x)^(
diff --git a/Changelog.md b/Changelog.md
index b658d4768b..b1c6213713 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -26,6 +26,7 @@
 - Fix flaky `check_repo_permissions` test (#7223)
 - Move model validation error messages to respective localization files (#7229)
 - Replace time-warp gem with newer, maintained timecop gem (#7234)
+- Update pre-commit-hooks to v5.0 and add checks `check-illegal-windows-names`, `check-json`, and `check-merge-conflict` (#7259)
 
 ## [v2.5.2]