diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c623c75b..a040f653 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -4,8 +4,12 @@
 # Thanks to https://github.com/sloria/environs/blob/master/.pre-commit-config.yaml
 
 # https://pre-commit.ci/#configuration
+# TODO: skip flake8 for now, it's failing on CI:
+# https://results.pre-commit.ci/run/github/126496135/1635173038.Vb5hHPmFT6q28HG-of-Dvg
+# ImportError: cannot import name 'SortImports' from 'isort' (/pc/clone/BQ54X-ogRzmpWm15sdE8hA/py_env-python3/lib/python3.8/site-packages/isort/__init__.py)
+# flake8.exceptions.FailedToLoadPlugin: Flake8 failed to load plugin "I00" due to cannot import name 'SortImports' from 'isort' (/pc/clone/BQ54X-ogRzmpWm15sdE8hA/py_env-python3/lib/python3.8/site-packages/isort/__init__.py).
 ci:
-  skip: [local-nitpick, generate-docs, pylint]
+  skip: [local-nitpick, generate-docs, pylint, flake8]
 
 repos:
   - repo: local
@@ -33,11 +37,11 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.25.0
+    rev: v2.29.0
     hooks:
       - id: pyupgrade
   - repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 21.9b0
     hooks:
       - id: black
         args: [--safe, --quiet]
@@ -59,12 +63,12 @@ repos:
       - id: python-no-log-warn
       - id: rst-backticks
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v2.3.2
+    rev: v2.4.1
     hooks:
       - id: prettier
         stages: [commit]
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
+    rev: 4.0.1
     hooks:
       - id: flake8
         additional_dependencies:
@@ -82,7 +86,7 @@ repos:
             yesqa,
           ]
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v0.910
+    rev: v0.910-1
     hooks:
       - id: mypy
         # Install additional types to fix new warnings that appeared on v0.910:
@@ -110,7 +114,7 @@ repos:
         args: [--ini, setup.cfg]
         exclude: tests/
   - repo: https://github.com/openstack/bashate
-    rev: 2.0.0
+    rev: 2.1.0
     hooks:
       - id: bashate
         # https://docs.openstack.org/bashate/latest/man/bashate.html#options
diff --git a/docs/examples.rst b/docs/examples.rst
index 8c442529..be94bd90 100644
--- a/docs/examples.rst
+++ b/docs/examples.rst
@@ -126,7 +126,6 @@ Contents of `styles/flake8.toml <https://github.com/andreoliwa/nitpick/blob/v0.2
     [[".pre-commit-config.yaml".repos]]
     yaml = """
       - repo: https://github.com/PyCQA/flake8
-        rev: 3.9.2
         hooks:
           - id: flake8
             additional_dependencies:
@@ -266,7 +265,6 @@ Contents of `styles/pre-commit/bash.toml <https://github.com/andreoliwa/nitpick/
     [[".pre-commit-config.yaml".repos]]
     yaml = """
       - repo: https://github.com/openstack/bashate
-        rev: 2.0.0
         hooks:
           - id: bashate
     """
diff --git a/styles/flake8.toml b/styles/flake8.toml
index 9d0065b3..9a6de88e 100644
--- a/styles/flake8.toml
+++ b/styles/flake8.toml
@@ -13,7 +13,6 @@ exclude = ".tox,build"
 [[".pre-commit-config.yaml".repos]]
 yaml = """
   - repo: https://github.com/PyCQA/flake8
-    rev: 3.9.2
     hooks:
       - id: flake8
         additional_dependencies:
diff --git a/styles/pre-commit/bash.toml b/styles/pre-commit/bash.toml
index cec09472..a110d896 100644
--- a/styles/pre-commit/bash.toml
+++ b/styles/pre-commit/bash.toml
@@ -1,7 +1,6 @@
 [[".pre-commit-config.yaml".repos]]
 yaml = """
   - repo: https://github.com/openstack/bashate
-    rev: 2.0.0
     hooks:
       - id: bashate
 """