diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 8c0dcdb..7a3eed5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,10 @@
 repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.3.0
+    hooks:
+      - id: end-of-file-fixer
+      - id: trailing-whitespace
+
   - repo: https://github.com/compilerla/conventional-pre-commit
     rev: v2.0.0
     hooks:
@@ -6,10 +12,8 @@
         stages:
           - commit-msg
 
-  # NOTE(mnaser): Switch back to upstream once the following PR is merged:
-  #               https://github.com/ansible/ansible-lint/pull/2457
-  - repo: https://github.com/mnaser/ansible-lint
-    rev: aa2b8d1
+  - repo: https://github.com/ansible/ansible-lint
+    rev: v6.8.6
     hooks:
       - id: ansible-lint
         files: \.(yaml|yml)$
@@ -29,8 +33,7 @@
     hooks:
       - id: isort
 
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+  - repo: https://github.com/markdownlint/markdownlint
+    rev: v0.12.0
     hooks:
-      - id: end-of-file-fixer
-      - id: trailing-whitespace
+      - id: markdownlint