diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4f6c77fb036..64d35729cf4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -59,7 +59,19 @@ repos:
     rev: v1.8.0
     hooks:
     -   id: rst-backticks
--   repo: https://github.com/dfm/black_nbconvert
-    rev: v0.2.0
-    hooks:
-    - id: black_nbconvert
+- repo: https://github.com/nbQA-dev/nbQA
+  rev: 0.8.1
+  hooks:
+    - id: nbqa-black
+      args: [--nbqa-mutate]
+      language_version: python3
+    - id: nbqa-pyupgrade
+      args: [--nbqa-mutate, --py36-plus]
+    - id: nbqa-isort
+      args: [--nbqa-mutate]
+    - id: nbqa-flake8
+      args: [--extend-ignore=E402]
+      additional_dependencies: [
+        flake8-bugbear>=20.3.2, # GH PR 2851
+        flake8-logging-format
+      ]