diff --git a/.circleci/config.yml b/.circleci/config.yml
index 69d9764ab78..b7700610196 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -260,14 +260,16 @@ jobs:
     steps:
       - checkout
       - pip_install:
-          args: pre-commit
+          args: pre-commit ufmt==1.3.0 black==21.9b0 usort==0.6.4
           descr: Install lint utilities
       - run:
           name: Install pre-commit hooks
           command: pre-commit install-hooks
       - run:
           name: Lint Python code and config files
-          command: pre-commit run --all-files
+          command: |
+            ufmt format .
+            pre-commit run --all-files
       - run:
           name: Required lint modifications
           when: on_fail
diff --git a/.circleci/config.yml.in b/.circleci/config.yml.in
index 4bd2e14147a..b37fcaa1e55 100644
--- a/.circleci/config.yml.in
+++ b/.circleci/config.yml.in
@@ -260,14 +260,16 @@ jobs:
     steps:
       - checkout
       - pip_install:
-          args: pre-commit
+          args: pre-commit ufmt==1.3.0 black==21.9b0 usort==0.6.4
           descr: Install lint utilities
       - run:
           name: Install pre-commit hooks
           command: pre-commit install-hooks
       - run:
           name: Lint Python code and config files
-          command: pre-commit run --all-files
+          command: |
+            ufmt format .
+            pre-commit run --all-files
       - run:
           name: Required lint modifications
           when: on_fail
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d4e9d2e337a..f216bf20473 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -10,20 +10,14 @@ repos:
         args: [--fix=lf]
       - id: end-of-file-fixer
 
-  # - repo: https://github.com/asottile/pyupgrade
-  #   rev: v2.29.0
-  #   hooks:
-  #     - id: pyupgrade
-  #       args: [--py37-plus]
-  #       name: Upgrade code
-
-  - repo: https://github.com/omnilib/ufmt
-    rev: v1.3.0
-    hooks:
-      - id: ufmt
-        additional_dependencies:
-          - black == 21.9b0
-          - usort == 0.6.4
+# TODO: re-enable after https://github.com/omnilib/ufmt/issues/56 is resolved
+#  - repo: https://github.com/omnilib/ufmt
+#    rev: v1.3.0
+#    hooks:
+#      - id: ufmt
+#        additional_dependencies:
+#          - black == 21.9b0
+#          - usort == 0.6.4
 
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.9.2