diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e48bc9fc..2e6c55d8 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,47 +9,65 @@ repos:
     hooks:
       - id: black
         args: [--target-version=py36]
+
+  # Autoformat: Python code
+  - repo: https://github.com/pre-commit/mirrors-autopep8
+    rev: v1.5.7
+    hooks:
+      - id: autopep8
+
+  # Autoformat: YAML, JSON, Markdown, etc.
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.3.2
+    hooks:
+      - id: prettier
+
+  # Check: YAML
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.0.1
     hooks:
       - id: check-yaml
         files: .*\.(yaml|yml)$
+
+  # Lint: Dockerfile
   - repo: https://github.com/hadolint/hadolint.git
     rev: v2.5.0
     hooks:
       - id: hadolint-docker
         # FIXME: remove after https://github.com/hadolint/hadolint/issues/628 is resolved
         entry: hadolint/hadolint:v2.5.0 hadolint
+
+  # Lint: YAML
   - repo: https://github.com/adrienverge/yamllint.git
     rev: v1.26.1
     hooks:
       - id: yamllint
         args: ["-d {extends: relaxed, rules: {line-length: disable}}", "-s"]
         files: \.(yaml|yml)$
+
+  # Lint: Bash scripts
   - repo: https://github.com/openstack-dev/bashate.git
     rev: 2.0.0
     hooks:
       - id: bashate
         args: ["--ignore=E006"]
+
+  # Lint: Shell scripts
   - repo: https://github.com/shellcheck-py/shellcheck-py
     rev: v0.7.2.1
     hooks:
       - id: shellcheck
         args: ["-x"]
+
+  # Lint: Python
   - repo: https://github.com/PyCQA/flake8
     rev: 3.9.2
     hooks:
       - id: flake8
-  - repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.5.7
-    hooks:
-      - id: autopep8
+
+  # Lint: Markdown
   - repo: https://github.com/igorshubovych/markdownlint-cli
     rev: v0.27.1
     hooks:
       - id: markdownlint
         args: ["--fix"]
-  - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.3.2
-    hooks:
-      - id: prettier